diff -r 7a529e890ce5 -r bf8784e09ef8 foundation/sysdefs/system_model.xml
--- a/foundation/sysdefs/system_model.xml	Mon Apr 27 17:46:06 2009 +0100
+++ b/foundation/sysdefs/system_model.xml	Tue Apr 28 13:58:04 2009 +0100
@@ -7,26 +7,26 @@
     <collection name="baseintegtests" long-name="Base Integration Testing" level="test">
      <component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
+            <unit bldFile="os\kernelhwsrv\baseintegtests\baseintegrationtest\group" mrp="os\kernelhwsrv\baseintegtests\baseintegrationtest\group\base_integration_test.mrp"/>
      </component>
     </collection>
     <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
      <component name="ubootldr" long-name="Boot Loader" introduced="9.2">
-      <unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+      <unit mrp="os\kernelhwsrv\brdbootldr\ubootldr\base_ubootldr.mrp"/>
      </component>
     </collection>
     <collection name="filesystems" long-name="File Systems" level="framework">
      <component name="compfs" long-name="Composite File System" filter="gt" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\scomp" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\scomp\base_f32_scomp.mrp"/>
      </component>
      <component name="fatfs" long-name="FAT File System" filter="gt" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\sfat" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\sfat\base_f32_sfat.mrp"/>
      </component>
      <component name="fat32fs" long-name="FAT32 File System" filter="gt" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\sfat32" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\sfat32\base_f32_sfat32.mrp"/>
      </component>
      <component name="iso9660fs" long-name="ISO9660 File System" filter="gt" plugin="Y" introduced="8.1b">
      </component>
@@ -34,21 +34,21 @@
      </component>
      <component name="rofs" long-name="ROFS" filter="gt" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\srofs" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\srofs\base_f32_srofs.mrp"/>
      </component>
      <component name="romfs" long-name="ROM File System" filter="gt" plugin="Y">
-      <unit mrp="os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
+      <unit mrp="os\kernelhwsrv\userlibandfileserver\fileserver\srom\base_f32_srom.mrp"/>
      </component>
      <component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\smassstorage" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\smassstorage\base_f32_smassstorage.mrp"/>
      </component>
     </collection>
     <collection name="unistore2" long-name="UniStore2 Flash Translation Layer" level="hw-if">
      <component name="uiibootsupport" long-name="UniStore2 Boot Support" filter="gt" introduced="9.1">
      </component>
      <component name="uiicore" long-name="UniStore2 Core" filter="gt" introduced="9.1">
-      <unit mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2_undeliverable.mrp"/>
+      <unit mrp="os\kernelhwsrv\kernel\eka\drivers\unistore2\base_drivers_unistore2_undeliverable.mrp"/>
      </component>
      <component name="uiicrashlogger" long-name="UniStore2 Crash Logger" filter="gt" introduced="9.1">
      </component>
@@ -58,18 +58,18 @@
     <collection name="bsptemplate" long-name="BSP Template" level="hw-if">
      <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
+            <unit bldFile="os\kernelhwsrv\bsptemplate\asspandvariant\template_variant" mrp="os\kernelhwsrv\bsptemplate\asspandvariant\base_template.mrp"/>
      </component>
     </collection>
     <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
      <component name="genericboardsupport" long-name="Generic Board Support">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\bsp" mrp="os\kernelhwsrv\kernel\eka\drivers\bsp\base_e32_drivers_bsp.mrp"/>
      </component>
      <component name="mediadrivers" long-name="Media Drivers">
       <!-- these are for storage media -->
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/media" mrp="os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\media" mrp="os\kernelhwsrv\kernel\eka\drivers\media\base_e32_drivers_media.mrp"/>
      </component>
      <component name="sdcard3c" long-name="SD Card 3C Driver" filter="gt" introduced="9.1">
      </component>
@@ -79,19 +79,19 @@
     <collection name="halservices" long-name="HAL Services" level="framework">
      <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/halservices/hal" mrp="os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
+            <unit bldFile="os\kernelhwsrv\halservices\hal" mrp="os\kernelhwsrv\halservices\hal\base_hal.mrp"/>
      </component>
     </collection>
     <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
      <component name="eka" long-name="Kernel Architecture" introduced="8.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka" mrp="os\kernelhwsrv\kernel\eka\base_e32.mrp"/>
      </component>
     </collection>
     <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
      <component name="e32test" long-name="E32 Tests" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kerneltest/e32test/group" mrp="os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kerneltest\e32test\group" mrp="os\kernelhwsrv\kerneltest\e32test\group\base_e32test.mrp"/>
      </component>
      <component name="e32utils" long-name="E32 Utilities">
      </component>
@@ -103,78 +103,78 @@
     <collection name="localisation" long-name="Localisation" level="adaptation">
      <component name="localesupport" long-name="Locale Support" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
      <component name="ethernetldd" long-name="Ethernet Drivers">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\ethernet" mrp="os\kernelhwsrv\kernel\eka\drivers\ethernet\base_e32_drivers_ethernet.mrp"/>
      </component>
      <component name="btrace" long-name="Kernel Trace Tool">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/trace" mrp="os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\trace" mrp="os\kernelhwsrv\kernel\eka\drivers\trace\base_e32_drivers_trace.mrp"/>
      </component>
      <component name="legacydrivers" long-name="Legacy Drivers">
-      <unit mrp="os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
+      <unit mrp="os\kernelhwsrv\kernel\eka\drivers\adc\base_e32_drivers_adc.mrp"/>
      </component>
      <component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b">
       <!-- these are LDDs for storage media -->
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\locmedia" mrp="os\kernelhwsrv\kernel\eka\drivers\locmedia\base_e32_drivers_locmedia.mrp"/>
      </component>
      <component name="runmodedebugger" long-name="Run Mode Debugger">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/debug" mrp="os/kernelhwsrv/kernel/eka/drivers/debug/base_e32_drivers_debug.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\debug" mrp="os\kernelhwsrv\kernel\eka\drivers\debug\base_e32_drivers_debug.mrp"/>
      </component>
      <component name="serialldd" long-name="Serial Port Drivers">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\ecomm" mrp="os\kernelhwsrv\kernel\eka\drivers\ecomm\base_e32_drivers_ecomm.mrp"/>
      </component>
      <component name="audioldd" long-name="Audio Drivers" introduced="8.1b">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/esound" mrp="os/kernelhwsrv/kernel/eka/drivers/esound/base_e32_drivers_sound.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\esound" mrp="os\kernelhwsrv\kernel\eka\drivers\esound\base_e32_drivers_sound.mrp"/>
      </component>
     </collection>
     <collection name="textmodeshell" long-name="Text Mode Shell" level="test">
      <component name="textshell" long-name="Text Shell" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\etshell" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\etshell\base_f32_eshell.mrp"/>
      </component>
      <component name="e32wsrv" long-name="Text Window Server">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/ewsrv" mrp="os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\ewsrv" mrp="os\kernelhwsrv\kernel\eka\ewsrv\base_e32_ewsrv.mrp"/>
      </component>
     </collection>
     <collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
      <component name="basedocs" long-name="Base Documentation">
-      <unit mrp="os/kernelhwsrv/userlibandfileserver/basedocs/base_documentation.mrp"/>
+      <unit mrp="os\kernelhwsrv\userlibandfileserver\basedocs\base_documentation.mrp"/>
      </component>
      <component name="estart" long-name="Base Starter" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\estart" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\estart\base_f32_estart.mrp"/>
      </component>
      <component name="compsupp" long-name="Compiler Runtime Support" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\compsupp" mrp="os\kernelhwsrv\kernel\eka\compsupp\base_e32_compsupp.mrp"/>
      </component>
      <component name="domainmgr" long-name="Domain Manager" introduced="8.1b">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\domainmgr\group" mrp="os\kernelhwsrv\userlibandfileserver\domainmgr\group\base_domain.mrp"/>
      </component>
      <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" plugin="Y" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="fileserver" long-name="File Server" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\group" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\group\base_f32.mrp"/>
      </component>
      <component name="nandftl" long-name="SSR Flash Translation Layer" filter="gt" introduced="7.0s" deprecated="9.1">
      </component>
      <component name="euser" long-name="User Library">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\euser" mrp="os\kernelhwsrv\kernel\eka\euser\base_e32_euser.mrp"/>
      </component>
     </collection>
    </block>
@@ -182,7 +182,7 @@
     <collection name="emulator" long-name="Emulator" level="bsp">
      <component name="emulatorbsp" long-name="Emulator BSP">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
+            <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">
      </component>
@@ -215,56 +215,56 @@
     <collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
      <component name="ziplib" long-name="Zip Compression Library" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/ossrv/compressionlibs/ziplib/group" mrp="os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib.mrp"/>
+            <unit bldFile="os\ossrv\compressionlibs\ziplib\group" mrp="os\ossrv\compressionlibs\ziplib\group\syslibs_ezlib.mrp"/>
      </component>
     </collection>
     <collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
      <component name="cstdlib" long-name="C Standard Library" introduced="ER5">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/ossrv/genericopenlibs/cstdlib/group" mrp="os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
+            <unit bldFile="os\ossrv\genericopenlibs\cstdlib\group" mrp="os\ossrv\genericopenlibs\cstdlib\group\syslibs_stdlib.mrp"/>
      </component>
      <component name="openenvcore" long-name="Open Environment Core" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="genericservices" long-name="Generic Services" level="utilities">
      <component name="activebackupclient" long-name="Active Backup Client">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="httputils" long-name="HTTP Utilities Library" introduced="6.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="mimerecognitionfw" long-name="MIME Recognition Framework">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit version="9.4" bldFile="os/ossrv/genericservices/s60compatibilityheaders/group94" mrp="os/ossrv/genericservices/s60compatibilityheaders/group94/tools_s60_header_compat94.mrp"/>
+            <unit version="9.4" bldFile="os\ossrv\genericservices\s60compatibilityheaders\group94" mrp="os\ossrv\genericservices\s60compatibilityheaders\group94\tools_s60_header_compat94.mrp"/>
      </component>
      <component name="syslibsdocs" long-name="Syslibs Documentation" class="doc">
-      <unit mrp="os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
+      <unit mrp="os\ossrv\genericservices\syslibsdocs\syslibs_documentation.mrp"/>
      </component>
      <component name="systemagent" long-name="System Agent" introduced="9.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
      <component name="apputils" long-name="Application Utilities" introduced="ER5">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="pluginfw" long-name="Plugin Framework" introduced="6.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit version="2" bldFile="os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom.mrp"/>
+            <unit version="2" bldFile="os\ossrv\lowlevellibsandfws\pluginfw\Group" mrp="os\ossrv\lowlevellibsandfws\pluginfw\group\syslibs_ecom.mrp"/>
      </component>
     </collection>
     <collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
@@ -313,7 +313,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ossrv" long-name="ossrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/ossrv/group"/>
+      <unit bldFile="os\ossrv\group"/>
      </component>
     </collection>
    </block>
@@ -321,77 +321,93 @@
     <collection name="authenticationservices" long-name="Authentication Services" level="utilities"/>
     <collection name="authorisation" long-name="Authorisation" level="utilities">
      <component name="userpromptservice" long-name="User Prompt Service" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\security\authorisation\userpromptservice\group" mrp="os\security\authorisation\userpromptservice\group\security_ups.mrp"/>
      </component>
     </collection>
     <collection name="contentmgmt" long-name="Content Management" level="utilities">
      <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\security\contentmgmt\cafrecogniserconfig" mrp="os\security\contentmgmt\cafrecogniserconfig\security_reccafconfig.mrp"/>
      </component>
      <component name="cafstreamingsupport" long-name="CAF Streaming Support" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\security\contentmgmt\cafstreamingsupport\group" mrp="os\security\contentmgmt\cafstreamingsupport\group\security_streamingcaf.mrp"/>
      </component>
      <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="crypto" long-name="Crypto Libraries" level="libraries">
      <component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\security\crypto\weakcryptospi\strong" mrp="os\security\crypto\weakcryptospi\group\security_cryptospi_strong.mrp"/>
      </component>
      <component name="strongcrypto" long-name="Strong Cryptography Library" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/security/crypto/weakcrypto/strong" mrp="os/security/crypto/weakcrypto/group/security_crypto_strong.mrp"/>
+            <unit bldFile="os\security\crypto\weakcrypto\strong" mrp="os\security\crypto\weakcrypto\group\security_crypto_strong.mrp"/>
      </component>
      <component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\security\crypto\weakcryptospi\group" mrp="os\security\crypto\weakcryptospi\group\security_cryptospi_weak.mrp"/>
      </component>
      <component name="weakcrypto" long-name="Weak Cryptography Library" filter="gt">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\security\crypto\weakcrypto\group" mrp="os\security\crypto\weakcrypto\group\security_crypto_weak.mrp"/>
      </component>
     </collection>
     <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
      <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\security\cryptomgmtlibs\securitycommonutils\group" mrp="os\security\cryptomgmtlibs\securitycommonutils\group\security_commonutils.mrp"/>
      </component>
      <component name="securitydocs" long-name="Security Documentation">
-      <unit mrp="os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
+      <unit mrp="os\security\cryptomgmtlibs\securitydocs\security_documentation.mrp"/>
      </component>
      <component name="securitytestfw" long-name="Security Test Framework" introduced="7.0" class="test" deprecated="tb92">
-      <unit mrp="os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp"/>
+      <unit mrp="os\security\cryptomgmtlibs\securitytestfw\group\security_testframework.mrp"/>
      </component>
      <component name="securityutils" long-name="Security Utils" introduced="8.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/security/cryptomgmtlibs/securityutils/group" mrp="os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
+            <unit bldFile="os\security\cryptomgmtlibs\securityutils\group" mrp="os\security\cryptomgmtlibs\securityutils\group\security_common.mrp"/>
      </component>
     </collection>
     <collection name="cryptoplugins" long-name="Crypto Plugins" level="plugins">
      <component name="cryptospiplugins" long-name="Crypto SPI Plugins" filter="gt" plugin="Y" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\security\cryptoplugins\cryptospiplugins\group" mrp="os\security\cryptoplugins\cryptospiplugins\group\security_cryptospi_plugins.mrp"/>
      </component>
     </collection>
     <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
      <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
-      <unit mrp="os/security/cryptoservices/rootcertificates/rootcerts.mrp"/>
+      <unit mrp="os\security\cryptoservices\rootcertificates\rootcerts.mrp"/>
      </component>
     </collection>
     <collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
      <component name="securityconfig" long-name="Security Config" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/security/securityanddataprivacytools/securityconfig/group" mrp="os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
+            <unit bldFile="os\security\securityanddataprivacytools\securityconfig\group" mrp="os\security\securityanddataprivacytools\securityconfig\group\security_config.mrp"/>
      </component>
      <component name="securitytools" long-name="Security Tools" class="PC" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
    </block>
@@ -403,55 +419,57 @@
     <collection name="loggingservices" long-name="Logging Services" level="server">
      <component name="eventlogger" long-name="Event Logger" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/loggingservices/eventlogger/group" mrp="os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
+            <unit bldFile="os\persistentdata\loggingservices\eventlogger\group" mrp="os\persistentdata\loggingservices\eventlogger\group\syslibs_logeng.mrp"/>
      </component>
      <component name="filelogger" long-name="File Logger" introduced="ER5">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/loggingservices/filelogger/group" mrp="os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
+            <unit bldFile="os\persistentdata\loggingservices\filelogger\group" mrp="os\persistentdata\loggingservices\filelogger\group\comms-infras_flogger.mrp"/>
      </component>
      <component name="rfilelogger" long-name="RFile Logger" deprecated="tb92" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/loggingservices/rfilelogger/group" mrp="os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
+            <unit bldFile="os\persistentdata\loggingservices\rfilelogger\group" mrp="os\persistentdata\loggingservices\rfilelogger\group\testtools_utilities.mrp"/>
      </component>
     </collection>
     <collection name="persistentstorage" long-name="Persistent Storage" level="framework">
      <component name="centralrepository" long-name="Central Repository" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/persistentstorage/centralrepository/group" mrp="os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
+            <unit bldFile="os\persistentdata\persistentstorage\centralrepository\group" mrp="os\persistentdata\persistentstorage\centralrepository\group\syslibs_centralrepository.mrp"/>
      </component>
      <component name="dbms" long-name="DBMS">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/persistentstorage/dbms/group" mrp="os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
+            <unit bldFile="os\persistentdata\persistentstorage\dbms\group" mrp="os\persistentdata\persistentstorage\dbms\group\syslibs_dbms.mrp"/>
      </component>
      <component name="sql" long-name="SQL" introduced="9.3">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/persistentstorage/sql/GROUP" mrp="os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
+            <unit bldFile="os\persistentdata\persistentstorage\sql\GROUP" mrp="os\persistentdata\persistentstorage\sql\group\syslibs_sql.mrp"/>
      </component>
      <component name="store" long-name="Store">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/persistentstorage/store/group" mrp="os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
+            <unit bldFile="os\persistentdata\persistentstorage\store\group" mrp="os\persistentdata\persistentstorage\store\group\syslibs_store.mrp"/>
      </component>
     </collection>
     <collection name="traceservices" long-name="Trace Services" level="server">
      <component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/traceservices/commsdebugutility/group" mrp="os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
+            <unit bldFile="os\persistentdata\traceservices\commsdebugutility\group" mrp="os\persistentdata\traceservices\commsdebugutility\group\comms-infras_commsdebugutility.mrp"/>
      </component>
      <component name="tracefw" long-name="Trace Framework" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/traceservices/tracefw/ulogger/group" mrp="os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
+            <unit bldFile="os\persistentdata\traceservices\tracefw\ulogger\group" mrp="os\persistentdata\traceservices\tracefw\ulogger\group\tools_debug_trace.mrp"/>
      </component>
      <component name="utrace" long-name="UTrace" introduced="9.3" deprecated="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/traceservices/utrace/group" mrp="os/persistentdata/traceservices/utrace/group/testtools_utrace_api.mrp"/>
+            <unit bldFile="os\persistentdata\traceservices\utrace\group" mrp="os\persistentdata\traceservices\utrace\group\testtools_utrace_api.mrp"/>
      </component>
     </collection>
     <collection name="featuremgmt" long-name="Feature Management" level="framework">
      <component name="featuremgr" long-name="Feature Manager" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\persistentdata\featuremgmt\featuremgr\group" mrp="os\persistentdata\featuremgmt\featuremgr\group\syslibs_featmgr.mrp"/>
      </component>
      <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="Future">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/persistentdata/featuremgmt/featureregistry/group" mrp="os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
+            <unit bldFile="os\persistentdata\featuremgmt\featureregistry\group" mrp="os\persistentdata\featuremgmt\featureregistry\group\syslibs_featreg.mrp"/>
      </component>
      <component name="featuremanager" long-name="Feature Manager">
      </component>
@@ -463,11 +481,11 @@
     <collection name="accessoryservices" long-name="Accessory Services" level="framework">
      <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="reftsp" long-name="Remote Control Reference TSP" filter="techview" plugin="Y" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/devicesrv/accessoryservices/reftsp/group" mrp="os/devicesrv/accessoryservices/reftsp/group/bluetooth_remotecontrol_refTSP.mrp"/>
+            <unit bldFile="os\devicesrv\accessoryservices\reftsp\group" mrp="os\devicesrv\accessoryservices\reftsp\group\bluetooth_remotecontrol_refTSP.mrp"/>
      </component>
      <component name="accessorymonitor" long-name="Accessory Monitor">
      </component>
@@ -537,13 +555,13 @@
      </component>
      <component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="LightClientDll" long-name="Light Client DLL">
      </component>
      <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="ServerExe" long-name="Server Exe">
      </component>
@@ -568,7 +586,7 @@
     <collection name="sysstatemgmt" long-name="System State Management" level="server">
      <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="starter" long-name="Starter">
      </component>
@@ -578,7 +596,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devicesrv" long-name="devicesrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/devicesrv/group"/>
+      <unit bldFile="os\devicesrv\group"/>
      </component>
     </collection>
    </block>
@@ -588,13 +606,13 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="lbs" long-name="lbs">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/lbs/group"/>
+      <unit bldFile="os\lbs\group"/>
      </component>
     </collection>
     <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
      <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" plugin="Y" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
@@ -602,15 +620,15 @@
      </component>
      <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" plugin="Y" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="defaultpositioningmodule" long-name="Default Positioning Module" plugin="Y" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="simulationpositioningmodule" long-name="Simulation Positioning Module" plugin="Y" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="locationbtgpspsy" long-name="BT GPS PSY">
      </component>
@@ -622,46 +640,46 @@
     <collection name="locationmgmt" long-name="Location Management" level="management">
      <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="locationcore" long-name="Location Core" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
      <component name="locationserver" long-name="Location Server" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
      <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" plugin="Y" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
+            <unit bldFile="os\lbs\networkprotocolmodules\privacyprotocolmodule\group" mrp="os\lbs\networkprotocolmodules\privacyprotocolmodule\group\lbs_privacyprotocolmodule.mrp"/>
      </component>
      <component name="suplprotocolmodule" long-name="SUPL Protocol Module" plugin="Y" introduced="tb91" deprecated="tb91">
      </component>
     </collection>
     <collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
      <component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" class="test">
-      <unit mrp="os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp"/>
+      <unit mrp="os\lbs\lbstest\lbstestproduct\group\lbs_testproduct.mrp"/>
      </component>
      <component name="locationprotocoltest" long-name="Location Protocol Tests" plugin="Y" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
    </block>
@@ -669,53 +687,53 @@
     <collection name="baseconnectionproviders" long-name="Base Connection Providers" level="framework">
      <component name="refcpr" long-name="Reference CPR" plugin="Y" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/baseconnectionproviders/refcpr/group" mrp="os/commsfw/baseconnectionproviders/refcpr/group/networking_ReferenceCPR.mrp"/>
+            <unit bldFile="os\commsfw\baseconnectionproviders\refcpr\group" mrp="os\commsfw\baseconnectionproviders\refcpr\group\networking_ReferenceCPR.mrp"/>
      </component>
      <component name="refscpr" long-name="Reference SCPR" plugin="Y" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/baseconnectionproviders/refscpr/group" mrp="os/commsfw/baseconnectionproviders/refscpr/group/networking_ReferenceSCPR.mrp"/>
+            <unit bldFile="os\commsfw\baseconnectionproviders\refscpr\group" mrp="os\commsfw\baseconnectionproviders\refscpr\group\networking_ReferenceSCPR.mrp"/>
      </component>
     </collection>
     <collection name="commsconfig" long-name="Comms Config" level="process">
      <component name="commsdatabase" long-name="Comms Database">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
+            <unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\group\comms-infras_commsdat.mrp"/>
      </component>
      <component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/commsconfig/commsdatabaseshim/group" mrp="os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
+            <unit bldFile="os\commsfw\commsconfig\commsdatabaseshim\group" mrp="os\commsfw\commsconfig\commsdatabaseshim\group\comms-infras_commdbshim.mrp"/>
      </component>
     </collection>
     <collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
      <component name="commfw" long-name="Comms Framework" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/commsfwutils/commfw/group" mrp="os/commsfw/commsfwutils/commfw/group/comms-infras_commsfw.mrp" priority="10"/>
+            <unit bldFile="os\commsfw\commsfwutils\commfw\group" mrp="os\commsfw\commsfwutils\commfw\group\comms-infras_commsfw.mrp" priority="10"/>
      </component>
      <component name="mbufmgr" long-name="MBuf Manager" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/commsfwutils/mbufmgr/group" mrp="os/commsfw/commsfwutils/mbufmgr/group/comms-infras_mbufmgr.mrp"/>
+            <unit bldFile="os\commsfw\commsfwutils\mbufmgr\group" mrp="os\commsfw\commsfwutils\mbufmgr\group\comms-infras_mbufmgr.mrp"/>
      </component>
     </collection>
     <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
      <component name="commstools" long-name="Comms Tools" introduced="tb91" class="PC">
-      <unit mrp="os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
+      <unit mrp="os\commsfw\commsfwtools\commstools\group\comms-infras_tools.mrp"/>
      </component>
      <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" class="PC">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
+            <unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\installdefaultcommdb\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\installdefaultcommdb\group\comms-infras_installdefaultcommdb.mrp" priority="1010"/>
      </component>
      <component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" class="config PC">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
+            <unit bldFile="os\commsfw\commsfwtools\preparedefaultcommsdatabase\defaultcommdb\group" mrp="os\commsfw\commsfwtools\preparedefaultcommsdatabase\defaultcommdb\group\comms-infras_defaultcommdb.mrp"/>
      </component>
     </collection>
     <collection name="commsprocess" long-name="Comms Process" level="process">
      <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/commsprocess/commsrootserverconfig/group" mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
+            <unit bldFile="os\commsfw\commsprocess\commsrootserverconfig\group" mrp="os\commsfw\commsprocess\commsrootserverconfig\group\comms-infras_rootserver.mrp"/>
      </component>
      <component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" class="config">
-      <unit mrp="os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp"/>
+      <unit mrp="os\commsfw\commsprocess\commsrootserverconfig\group\comms-infras_rootserver-config.mrp"/>
      </component>
     </collection>
     <collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
@@ -724,41 +742,43 @@
     <collection name="datacommsserver" long-name="Data Comms Server" level="framework">
      <component name="esockserver" long-name="ESock Server">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit version="2" bldFile="os/commsfw/datacommsserver/esockserver/group" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp"/>
+            <unit version="2" bldFile="os\commsfw\datacommsserver\esockserver\group" mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock.mrp"/>
      </component>
      <component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" class="config">
-      <unit version="2" mrp="os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp"/>
+      <unit version="2" mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock-config.mrp"/>
      </component>
      <component name="networkcontroller" long-name="Network Controller" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/datacommsserver/networkcontroller/group" mrp="os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
+            <unit bldFile="os\commsfw\datacommsserver\networkcontroller\group" mrp="os\commsfw\datacommsserver\networkcontroller\group\networking_netcon.mrp"/>
      </component>
      <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit version="1" bldFile="os/commsfw/datacommsserver/networkinterfacemgr/group" mrp="os/commsfw/datacommsserver/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
+            <unit version="1" bldFile="os\commsfw\datacommsserver\networkinterfacemgr\group" mrp="os\commsfw\datacommsserver\networkinterfacemgr\group\comms-infras_nifman.mrp"/>
      </component>
      <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/datacommsserver/networkingdialogapi/group" mrp="os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
+            <unit bldFile="os\commsfw\datacommsserver\networkingdialogapi\group" mrp="os\commsfw\datacommsserver\networkingdialogapi\group\networking_dialog.mrp"/>
      </component>
      <component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\commsfw\datacommsserver\networkingdialogapi\default" mrp="os\commsfw\datacommsserver\networkingdialogapi\default\networking_dialog_default.mrp"/>
      </component>
     </collection>
     <collection name="serialserver" long-name="Serial Server" level="server">
      <component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/serialserver/c32serialserver/group" mrp="os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
+            <unit bldFile="os\commsfw\serialserver\c32serialserver\group" mrp="os\commsfw\serialserver\c32serialserver\group\ser-comms_c32.mrp"/>
      </component>
      <component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" class="config">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/serialserver/c32serialserverconfig" mrp="os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
+            <unit bldFile="os\commsfw\serialserver\c32serialserverconfig" mrp="os\commsfw\serialserver\c32serialserverconfig\ser-comms_c32-config.mrp"/>
      </component>
      <component name="c32serialserverdocs" long-name="C32 Serial Server Documentation">
-      <unit mrp="os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
+      <unit mrp="os\commsfw\serialserver\c32serialserverdocs\ser-comms_documentation.mrp"/>
      </component>
      <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/serialserver/packetloopbackcsy/group" mrp="os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
+            <unit bldFile="os\commsfw\serialserver\packetloopbackcsy\group" mrp="os\commsfw\serialserver\packetloopbackcsy\group\packetloopbackcsy.mrp"/>
      </component>
      <component name="serialportcsy" long-name="Serial Port CSY" class="placeholder" plugin="Y" introduced="ER5">
       <!-- placeholder for ser-comms_serialportcsy, currently built by C32 -->
@@ -766,13 +786,13 @@
     </collection>
     <collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
      <component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" class="doc">
-      <unit mrp="os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
+      <unit mrp="os\commsfw\commsfw_info\commsinfrastructuredocs\comms-infras_documentation.mrp"/>
      </component>
     </collection>
     <collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
      <component name="commselements" long-name="Comms Elements" introduced="8.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/commsfw/commsfwsupport/commselements/group" mrp="os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
+            <unit bldFile="os\commsfw\commsfwsupport\commselements\group" mrp="os\commsfw\commsfwsupport\commselements\group\comms-infras_elements.mrp"/>
      </component>
     </collection>
    </block>
@@ -780,144 +800,150 @@
     <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
      <component name="internetsockets" long-name="Internet Sockets" introduced="ER5">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="linklayercontrol" long-name="Link Layer Control" level="hw-if">
      <component name="nullagt" long-name="NULL AGT" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/linklayercontrol/nullagt/group" mrp="os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
+            <unit bldFile="os\networkingsrv\linklayercontrol\nullagt\group" mrp="os\networkingsrv\linklayercontrol\nullagt\group\networking_nullagt.mrp"/>
      </component>
     </collection>
     <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
      <component name="ethernetnif" long-name="Ethernet NIF" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
+            <unit bldFile="os\networkingsrv\linklayerprotocols\ethernetnif\group" mrp="os\networkingsrv\linklayerprotocols\ethernetnif\group\networking_ether802.mrp"/>
      </component>
      <component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" plugin="Y" introduced="7.0">
-      <unit mrp="os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp"/>
+      <unit mrp="os\networkingsrv\linklayerprotocols\ethernetpacketdriver\group\networking_etherdrv_srconly.mrp"/>
      </component>
      <component name="pppconfig" long-name="PPP Config" introduced="ER5">
-      <unit version="1" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp"/>
+      <unit version="1" mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp-config.mrp"/>
      </component>
      <component name="pppnif" long-name="PPP NIF" plugin="Y" introduced="ER5">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit version="1" bldFile="os/networkingsrv/linklayerprotocols/pppnif/group" mrp="os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp"/>
+            <unit version="1" bldFile="os\networkingsrv\linklayerprotocols\pppnif\group" mrp="os\networkingsrv\linklayerprotocols\pppnif\group\networking_ppp.mrp"/>
      </component>
      <component name="slipnif" long-name="SLIP NIF" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/linklayerprotocols/slipnif/group" mrp="os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
+            <unit bldFile="os\networkingsrv\linklayerprotocols\slipnif\group" mrp="os\networkingsrv\linklayerprotocols\slipnif\group\networking_slip.mrp"/>
      </component>
      <component name="tunnelnif" long-name="Tunnel NIF" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
+            <unit bldFile="os\networkingsrv\linklayerprotocols\tunnelnif\group" mrp="os\networkingsrv\linklayerprotocols\tunnelnif\group\networking_tunnelnif.mrp"/>
      </component>
     </collection>
     <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
      <component name="packetlogger" long-name="Packet Logger" introduced="8.1" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="ipcpr" long-name="IP CPR" plugin="Y" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/networkcontrol/ipcpr/group" mrp="os/networkingsrv/networkcontrol/ipcpr/group/networking_ipcpr.mrp"/>
+            <unit bldFile="os\networkingsrv\networkcontrol\ipcpr\group" mrp="os\networkingsrv\networkcontrol\ipcpr\group\networking_ipcpr.mrp"/>
      </component>
      <component name="ipcprshim" long-name="IP CPR Shim" plugin="Y" deprecated="Future">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/networkcontrol/ipcprshim/group" mrp="os/networkingsrv/networkcontrol/ipcprshim/group/networking_shimcpr.mrp"/>
+            <unit bldFile="os\networkingsrv\networkcontrol\ipcprshim\group" mrp="os\networkingsrv\networkcontrol\ipcprshim\group\networking_shimcpr.mrp"/>
      </component>
      <component name="ipnetworklayer" long-name="IP Network Layer" plugin="Y" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\networkingsrv\networkcontrol\ipnetworklayer\group" mrp="os\networkingsrv\networkcontrol\ipnetworklayer\group\networking_ipproto.mrp"/>
      </component>
      <component name="ipscpr" long-name="IP SCPR" plugin="Y" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/networkcontrol/ipscpr/group" mrp="os/networkingsrv/networkcontrol/ipscpr/group/networking_ipscpr.mrp"/>
+            <unit bldFile="os\networkingsrv\networkcontrol\ipscpr\group" mrp="os\networkingsrv\networkcontrol\ipscpr\group\networking_ipscpr.mrp"/>
      </component>
      <component name="iptransportlayer" long-name="IP Transport Layer" plugin="Y">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\networkingsrv\networkcontrol\iptransportlayer\group" mrp="os\networkingsrv\networkcontrol\iptransportlayer\group\networking_iptransport.mrp"/>
      </component>
      <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" 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="qosfwprt" long-name="QoS Framework PRT" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" plugin="Y">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\networkingsrv\networkcontrol\qosipscpr\group" mrp="os\networkingsrv\networkcontrol\qosipscpr\group\networking_qosipscpr.mrp"/>
      </component>
      <component name="qoslib" long-name="QoS Library" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
      <component name="ipeventnotifier" long-name="IP Event Notifier" plugin="Y" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="iphook" long-name="IP Hook" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
+            <unit bldFile="os\networkingsrv\networkprotocols\iphook\inhook6\group" mrp="os\networkingsrv\networkprotocols\iphook\inhook6\group\networking_inhook6.mrp"/>
      </component>
      <component name="mobileip" long-name="Mobile IP" plugin="Y" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/networkprotocols/mobileip/group" mrp="os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-     </component>
-     <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" plugin="Y" introduced="7.0">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-     </component>
-     <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" class="config">
-      <unit mrp="os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp"/>
+            <unit bldFile="os\networkingsrv\networkprotocols\mobileip\group" mrp="os\networkingsrv\networkprotocols\mobileip\group\networking_mobileip.mrp"/>
+     </component>
+     <component name="tcpipv4v6prt" long-name="tcp\ipv4\v6 PRT" plugin="Y" introduced="7.0">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\networkingsrv\networkprotocols\tcpipv4v6prt\group" mrp="os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6.mrp"/>
+     </component>
+     <component name="tcpipv4config" long-name="tcp\ipv4\v6 Config" introduced="7.0" class="config">
+      <unit mrp="os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6-config.mrp"/>
      </component>
     </collection>
     <collection name="networksecurity" long-name="Network Security" level="framework">
      <component name="ipsec" long-name="IPsec" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="tls" long-name="TLS" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/networkingsrv/networksecurity/tls/group" mrp="os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
+            <unit bldFile="os\networkingsrv\networksecurity\tls\group" mrp="os\networkingsrv\networksecurity\tls\group\networking_tls.mrp"/>
      </component>
      <component name="tlsprovider" long-name="TLS Provider" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
      <component name="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5">
-      <unit mrp="os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp"/>
+      <unit mrp="os\networkingsrv\networkingtestandutils\exampleinternetutilities\group\networking_inetutil.mrp"/>
      </component>
      <component name="ipanalyzer" long-name="IP Analyzer" introduced="7.0" deprecated="tb92">
-      <unit mrp="os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp"/>
+      <unit mrp="os\networkingsrv\networkingtestandutils\ipanalyzer\group\networking_iprotor.mrp"/>
      </component>
      <component name="ipprobe" long-name="IP Probe" plugin="Y" introduced="7.0s">
-      <unit mrp="os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp"/>
+      <unit mrp="os\networkingsrv\networkingtestandutils\ipprobe\group\networking_probe.mrp"/>
      </component>
      <component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" plugin="Y">
-      <unit mrp="os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp"/>
+      <unit mrp="os\networkingsrv\networkingtestandutils\ipv6to4tunnel\group\networking_6to4.mrp"/>
      </component>
      <component name="networkingexamples" long-name="Networking Examples" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="networkingunittest" long-name="Networking Unit Test" introduced="7.0" class="test">
-      <unit mrp="os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp"/>
+      <unit mrp="os\networkingsrv\networkingtestandutils\networkingunittest\group\networking_unittest.mrp"/>
      </component>
     </collection>
     <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
      <component name="predictorcompression" long-name="Predictor Compression" plugin="Y" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     <collection name="commsdb" long-name="Comms DB" level="server">
@@ -926,27 +952,27 @@
     </collection>
     <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
      <component name="networkingdocs" long-name="Networking Documentation" class="doc">
-      <unit mrp="os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
+      <unit mrp="os\networkingsrv\networkingsrv_info\networkingdocs\networking_documentation.mrp"/>
      </component>
      <component name="networkingrom" long-name="Networking ROM">
       <!--  production component: contains the IBY files -->
      </component>
     </collection>
-    <collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
+    <collection name="tcpiputils" long-name="tcp\ip Utilities" level="plugin">
      <component name="dhcp" long-name="DHCP" introduced="8.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="dnd" long-name="DND" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" 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="networkaddressandporttranslation" long-name="Network Address and Port Translation" plugin="Y" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -954,7 +980,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="networkingsrv" long-name="networkingsrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/networkingsrv/group"/>
+      <unit bldFile="os\networkingsrv\group"/>
      </component>
     </collection>
    </block>
@@ -984,7 +1010,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlan" long-name="wlan">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/wlan/group"/>
+      <unit bldFile="os\wlan\group"/>
      </component>
     </collection>
    </block>
@@ -992,21 +1018,23 @@
     <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
      <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" plugin="Y" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="basebandchanneladaptorforisc" long-name="Baseband Channel Adaptor for ISC" plugin="Y">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforisc\group" mrp="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforisc\group\networking_bcatoisc.mrp"/>
      </component>
     </collection>
     <collection name="fax" long-name="Fax" level="server">
      <component name="faxclientandserver" long-name="Fax Client and Server">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
      <component name="mocksy" long-name="MockSY" introduced="tb91" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="smsprotocols" long-name="SMS Protocols" level="framework">
@@ -1014,47 +1042,49 @@
      </component>
      <component name="smsstack" long-name="SMS Stack" plugin="Y" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" plugin="Y" introduced="6.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/telephonyprotocols/csdagt/group" mrp="os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-     </component>
-     <component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" plugin="Y" introduced="7.0s">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-     </component>
-     <component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" plugin="Y" introduced="7.0s">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
+            <unit bldFile="os\cellularsrv\telephonyprotocols\csdagt\group" mrp="os\cellularsrv\telephonyprotocols\csdagt\group\networking_csdagt.mrp"/>
+     </component>
+     <component name="gprsumtsqosinterface" long-name="gprs\umts QoS Interface" plugin="Y" introduced="7.0s">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group" mrp="os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group\networking_umtsif.mrp"/>
+     </component>
+     <component name="gprsumtsqosprt" long-name="gprs\umts QoS PRT" plugin="Y" introduced="7.0s">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group" mrp="os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group\networking_guqos.mrp"/>
      </component>
      <component name="pdplayer" long-name="PDP Layer" plugin="Y" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\cellularsrv\telephonyprotocols\pdplayer\group" mrp="os\cellularsrv\telephonyprotocols\pdplayer\group\networking_pdp.mrp"/>
      </component>
      <component name="psdagt" long-name="PSD AGT" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="qos3gppcpr" long-name="QoS 3GPP CPR" plugin="Y" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="qosextnapi" long-name="QoS Extn API" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="rawipnif" long-name="Raw IP NIF" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-     </component>
-     <component name="umtsgprsscpr" long-name="UMTS/GPRS SCPR" plugin="Y" introduced="8.1">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group" mrp="os/cellularsrv/telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp"/>
+            <unit bldFile="os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group" mrp="os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group\networking_spud.mrp"/>
+     </component>
+     <component name="umtsgprsscpr" long-name="umts\gprs SCPR" plugin="Y" introduced="8.1">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\cellularsrv\telephonyprotocols\umtsgprsscpr\group" mrp="os\cellularsrv\telephonyprotocols\umtsgprsscpr\group\networking_UmtsGprsSCPR.mrp"/>
      </component>
     </collection>
     <collection name="telephonyreferenceplat" long-name="Telephony Reference Platform" level="plugin"/>
@@ -1062,75 +1092,75 @@
      <component name="etelcdma" long-name="ETel CDMA" introduced="7.0s">
      </component>
      <component name="etelconfig" long-name="ETel Config">
-      <unit mrp="os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp"/>
+      <unit mrp="os\cellularsrv\telephonyserver\etelserverandcore\group\telephony_etel-config.mrp"/>
      </component>
      <component name="etelmultimode" long-name="ETel Multimode" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/telephonyserver/etelmultimode/group" mrp="os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
+            <unit bldFile="os\cellularsrv\telephonyserver\etelmultimode\group" mrp="os\cellularsrv\telephonyserver\etelmultimode\group\telephony_etelmm.mrp"/>
      </component>
      <component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
+            <unit bldFile="os\cellularsrv\telephonyserver\etelpacketdata\group" mrp="os\cellularsrv\telephonyserver\etelpacketdata\group\telephony_etelpckt.mrp"/>
      </component>
      <component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="etelserverandcore" long-name="ETel Server and Core">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
      <component name="cdmatsy" long-name="CDMA TSY" plugin="Y" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/telephonyserverplugins/cdmatsy/group" mrp="os/cellularsrv/telephonyserverplugins/cdmatsy/group/telephony_cdmatsy.mrp"/>
+            <unit bldFile="os\cellularsrv\telephonyserverplugins\cdmatsy\group" mrp="os\cellularsrv\telephonyserverplugins\cdmatsy\group\telephony_cdmatsy.mrp"/>
      </component>
      <component name="common_tsy" long-name="Common TSY" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
+            <unit bldFile="os\cellularsrv\telephonyserverplugins\common_tsy\group" mrp="os\cellularsrv\telephonyserverplugins\common_tsy\group\telephony_commontsy.mrp"/>
      </component>
      <component name="multimodetsy" long-name="Multimode TSY" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" plugin="Y" introduced="7.0" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
+            <unit bldFile="os\cellularsrv\telephonyserverplugins\simtsy\group" mrp="os\cellularsrv\telephonyserverplugins\simtsy\group\telephony_simtsy.mrp"/>
      </component>
     </collection>
     <collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
      <component name="dial" long-name="Dial" deprecated="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="telephonywatchers" long-name="Telephony Watchers" plugin="Y" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
      <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="intersystemcomm" long-name="Inter-System Communication" filter="gt" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/cellularsrv/basebandabstraction/intersystemcomm/group" mrp="os/cellularsrv/basebandabstraction/intersystemcomm/group/networking_isc.mrp"/>
+            <unit bldFile="os\cellularsrv\basebandabstraction\intersystemcomm\group" mrp="os\cellularsrv\basebandabstraction\intersystemcomm\group\networking_isc.mrp"/>
      </component>
      <component name="isc_if" long-name="ISC Interface">
      </component>
     </collection>
     <collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
      <component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" class="doc">
-      <unit mrp="os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
+      <unit mrp="os\cellularsrv\cellularsrv_info\telephonyconfidentialdocs\telephony_confidential.mrp"/>
      </component>
      <component name="telephonydocs" long-name="Telephony Documentation" class="doc">
-      <unit mrp="os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
+      <unit mrp="os\cellularsrv\cellularsrv_info\telephonydocs\telephony_documentation.mrp"/>
      </component>
     </collection>
     <collection name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
@@ -1186,7 +1216,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="cellularsrv" long-name="cellularsrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/cellularsrv/group"/>
+      <unit bldFile="os\cellularsrv\group"/>
      </component>
     </collection>
    </block>
@@ -1194,33 +1224,33 @@
     <collection name="bluetooth" long-name="Bluetooth" level="framework">
      <component name="btcomm" long-name="Bluetooth CSY" plugin="Y" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="btdocs" long-name="Bluetooth Documentation" class="doc">
-      <unit mrp="os/shortlinksrv/bluetooth/btdocs/bluetooth_documentation.mrp"/>
+      <unit mrp="os\shortlinksrv\bluetooth\btdocs\bluetooth_documentation.mrp"/>
      </component>
      <component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" class="test">
-      <unit mrp="os/shortlinksrv/bluetooth/btexample/test/bluetooth_tests_examples.mrp"/>
+      <unit mrp="os\shortlinksrv\bluetooth\btexample\test\bluetooth_tests_examples.mrp"/>
      </component>
      <component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="btsdp" long-name="Bluetooth SDP" introduced="6.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="btstack" long-name="Bluetooth Stack" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
@@ -1229,76 +1259,78 @@
     <collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
      <component name="btpan" long-name="Bluetooth PAN Profile" plugin="Y" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
      <component name="btcommon" long-name="Bluetooth Build Utilities">
-      <unit mrp="os/shortlinksrv/bluetoothmgmt/btcommon/bluetooth_common.mrp"/>
+      <unit mrp="os\shortlinksrv\bluetoothmgmt\btcommon\bluetooth_common.mrp"/>
      </component>
      <component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="btconfig" long-name="Bluetooth Config" class="config">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\shortlinksrv\bluetoothmgmt\btconfig" mrp="os\shortlinksrv\bluetoothmgmt\btconfig\bluetooth_config.mrp"/>
      </component>
      <component name="btmgr" long-name="Bluetooth Manager" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="btrom" long-name="Bluetooth ROM" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="bthci" long-name="Host Controller Interface" level="server">
      <component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" plugin="Y" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="bthci1" long-name="Bluetooth HCI Framework 1" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/shortlinksrv/bthci/bthci1" mrp="os/shortlinksrv/bthci/bthci1/bluetooth_hci.mrp"/>
+            <unit bldFile="os\shortlinksrv\bthci\bthci1" mrp="os\shortlinksrv\bthci\bthci1\bluetooth_hci.mrp"/>
      </component>
      <component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="irda" long-name="IrDA" level="plugin">
      <component name="irdaconfig" long-name="IrDA Config" introduced="6.0" class="config">
      </component>
      <component name="irdadocs" long-name="IrDA Documentation" class="doc">
-      <unit mrp="os/shortlinksrv/irda/irdadocs/infra-red_documentation.mrp"/>
+      <unit mrp="os\shortlinksrv\irda\irdadocs\infra-red_documentation.mrp"/>
      </component>
      <component name="irdastack" long-name="IrDA Stack">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="irdatest" long-name="IrDA Test" introduced="9.2" class="test">
-      <unit mrp="os/shortlinksrv/irda/irdatest/group/infra-red_irda_test.mrp"/>
+      <unit mrp="os\shortlinksrv\irda\irdatest\group\infra-red_irda_test.mrp"/>
      </component>
     </collection>
     <collection name="usbldd" long-name="Shortlink Logical Device Drivers" level="hw-if">
      <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbc" mrp="os\kernelhwsrv\kernel\eka\drivers\usbc\base_e32_drivers_usbcli.mrp"/>
      </component>
     </collection>
     <collection name="usbmgmt" long-name="USB Management" level="server">
      <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" class="doc">
-      <unit mrp="os/shortlinksrv/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
+      <unit mrp="os\shortlinksrv\usbmgmt\usbclassandmgrdocs\usb_documentation.mrp"/>
      </component>
      <component name="usbmgr" long-name="USB Manager">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit version="2" bldFile="os/shortlinksrv/usbmgmt/usbmgr/group" mrp="os/shortlinksrv/usbmgmt/usbmgr/group/usb_manager.mrp"/>
+            <unit version="2" bldFile="os\shortlinksrv\usbmgmt\usbmgr\group" mrp="os\shortlinksrv\usbmgmt\usbmgr\group\usb_manager.mrp"/>
      </component>
      <component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" class="test">
-      <unit version="2" mrp="os/shortlinksrv/usbmgmt/usbmgrtest/group/usb_test.mrp"/>
+      <unit version="2" mrp="os\shortlinksrv\usbmgmt\usbmgrtest\group\usb_test.mrp"/>
      </component>
     </collection>
     <collection name="usbbsptemplate" long-name="USB BSP Template" level="adaptation"/>
@@ -1307,7 +1339,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shortlinksrv" long-name="shortlinksrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/shortlinksrv/group"/>
+      <unit bldFile="os\shortlinksrv\group"/>
      </component>
     </collection>
    </block>
@@ -1315,20 +1347,20 @@
     <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
      <component name="camerafw" long-name="Camera Framework" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/mm/imagingandcamerafws/camerafw/framework/group" mrp="os/mm/imagingandcamerafws/camerafw/framework/group/multimedia_ecam_framework.mrp"/>
+            <unit bldFile="os\mm\imagingandcamerafws\camerafw\framework\group" mrp="os\mm\imagingandcamerafws\camerafw\framework\group\multimedia_ecam_framework.mrp"/>
      </component>
      <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" class="test">
-      <unit mrp="os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"/>
+      <unit mrp="os\mm\imagingandcamerafws\cameraunittest\group\multimedia_unittest_ecam_source.mrp"/>
      </component>
      <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" class="test">
-      <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="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" class="test">
-      <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>
     </collection>
     <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
@@ -1337,127 +1369,127 @@
     <collection name="mmdataplane" long-name="Multimedia Data Plane Adaptation" level="hw-if"/>
     <collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
      <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" class="test">
-      <unit mrp="os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"/>
+      <unit mrp="os\mm\mmdevicefw\mdfunittest\group\multimedia_unittest_mdf_source.mrp"/>
      </component>
      <component name="mdf" long-name="Media Device Framework" introduced="9.2">
      </component>
      <component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
      <component name="a3facl" long-name="A3F Audio Component Library" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" class="test">
-      <unit mrp="os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp"/>
+      <unit mrp="os\mm\mmhais\dvbhunittest\hai\dvbh\group\multimedia_unittest_dvbhhai.mrp"/>
      </component>
      <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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"/>
      </component>
     </collection>
     <collection name="mmhostprocess" long-name="Multimedia Host Process" level="devices"/>
     <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
      <component name="3gplib" long-name="3GP Library" introduced="Future">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" class="test">
-      <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>
      <component name="cameraplugins" long-name="Camera Plugins" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/mm/imagingandcamerafws/camerafw/plugins/group" mrp="os/mm/imagingandcamerafws/camerafw/plugins/group/multimedia_ecam_plugins.mrp"/>
+            <unit bldFile="os\mm\imagingandcamerafws\camerafw\plugins\group" mrp="os\mm\imagingandcamerafws\camerafw\plugins\group\multimedia_ecam_plugins.mrp"/>
      </component>
      <component name="imagingplugins" long-name="Imaging Plugins" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
      <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/mm/mmresourcemgmt/mmresctrl/group" mrp="os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
+            <unit bldFile="os\mm\mmresourcemgmt\mmresctrl\group" mrp="os\mm\mmresourcemgmt\mmresctrl\group\multimedia_a3f_refmmrc.mrp"/>
      </component>
     </collection>
     <collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation"/>
     <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
      <component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" class="test">
-      <unit mrp="os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp"/>
+      <unit mrp="os\mm\mmtestenv\mmtestagent\group\multimediatestagent_source.mrp"/>
      </component>
      <component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" class="test">
-      <unit mrp="os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp"/>
+      <unit mrp="os\mm\mmtestenv\mmtestfw\group\multimedia_testframework_source.mrp"/>
      </component>
      <component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" class="test">
-      <unit mrp="os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp"/>
+      <unit mrp="os\mm\mmtestenv\mmtestfwunittest\group\multimedia_unittest_testframework_source.mrp"/>
      </component>
      <component name="mmtesttools" long-name="Multimedia Test Tools">
-      <unit mrp="os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp"/>
+      <unit mrp="os\mm\mmtestenv\mmtesttools\group\multimedia_testtools_source.mrp"/>
      </component>
     </collection>
     <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
      <component name="openmax" long-name="OpenMAX" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/mm/omxil/openmax/group" mrp="os/mm/omxil/openmax/group/multimedia_openmax.mrp"/>
+            <unit bldFile="os\mm\omxil\openmax\group" mrp="os\mm\omxil\openmax\group\multimedia_openmax.mrp"/>
      </component>
     </collection>
     <collection name="devsound" long-name="Sound Device" level="devices">
      <component name="a3facf" long-name="A3F Audio Component Framework" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="a3fcharacterisationtest" long-name="A3F Characterisation Tests" introduced="tb91" class="test">
-      <unit mrp="os/mm/devsound/a3fcharacterisationtest/group/multimedia_a3f_devsound_char.mrp"/>
+      <unit mrp="os\mm\devsound\a3fcharacterisationtest\group\multimedia_a3f_devsound_char.mrp"/>
      </component>
      <component name="a3fdevsound" long-name="A3F DevSound" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb92">
-      <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" plugin="Y" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="btdevsound" long-name="Bluetooth DevSound Plugin" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="devsoundapi" long-name="DevSound API" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="codecs" long-name="Codecs" level="middleware">
@@ -1471,7 +1503,7 @@
     <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
      <component name="addeddevsoundcontrol" long-name="Added DevSound Control">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/mm/devsoundextensions/addeddevsoundcontrol/Group"/>
+      <unit bldFile="os\mm\devsoundextensions\addeddevsoundcontrol\Group"/>
      </component>
      <component name="audiorouting" long-name="Audio Routing">
      </component>
@@ -1491,7 +1523,7 @@
      </component>
      <component name="mmfdevsoundserverplatsec" long-name="MMF DevSound Server PlatSec">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/mm/devsoundextensions/mmfdevsoundserverplatsec/Group"/>
+      <unit bldFile="os\mm\devsoundextensions\mmfdevsoundserverplatsec\Group"/>
      </component>
      <component name="restrictedaudiooutput" long-name="Restricted Audio Output">
      </component>
@@ -1504,7 +1536,7 @@
     </collection>
     <collection name="mm_info" long-name="Multimedia Info" level="app-if">
      <component name="mmdocs" long-name="Multimedia Documentation">
-      <unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
+      <unit mrp="os\mm\mm_info\mmdocs\multimedia_documentation.mrp"/>
      </component>
     </collection>
     <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
@@ -1516,7 +1548,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mm" long-name="mm">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/mm/group"/>
+      <unit bldFile="os\mm\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -1524,32 +1556,32 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AacEncoderPlugin" long-name="AacEncoderPlugin">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/mm/audio/ARM_CMMF_codecs/AacEncoderPlugin/Group"/>
+      <unit bldFile="os\mm\audio\arm_CMMF_codecs\aacencoderplugin\Group"/>
      </component>
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AmrNbCodecPlugin" long-name="AmrNbCodecPlugin">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/mm/audio/ARM_CMMF_codecs/AmrNbCodecPlugin/Group"/>
+      <unit bldFile="os\mm\audio\arm_CMMF_codecs\amrnbcodecplugin\Group"/>
      </component>
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="AmrWbCodecPlugin" long-name="AmrWbCodecPlugin">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/mm/audio/ARM_CMMF_codecs/AmrWbCodecPlugin/Group"/>
+      <unit bldFile="os\mm\audio\arm_CMMF_codecs\amrwbcodecplugin\Group"/>
      </component>
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="EAacPlusCodecPlugin" long-name="EAacPlusCodecPlugin">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/mm/audio/ARM_CMMF_codecs/EAacPlusCodecPlugin/Group"/>
+      <unit bldFile="os\mm\audio\arm_CMMF_codecs\eaacpluscodecplugin\Group"/>
      </component>
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="MP3CodecPlugin" long-name="MP3CodecPlugin">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/mm/audio/ARM_CMMF_codecs/MP3CodecPlugin/Group"/>
+      <unit bldFile="os\mm\audio\arm_CMMF_codecs\mp3codecplugin\Group"/>
      </component>
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="WMADecoderPlugin" long-name="WMADecoderPlugin">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/mm/audio/ARM_CMMF_codecs/WMADecoderPlugin/Group"/>
+      <unit bldFile="os\mm\audio\arm_CMMF_codecs\wmadecoderplugin\Group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -1557,7 +1589,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ARM_MDF_Decoders" long-name="ARM_MDF_Decoders">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/mm/video/ARM_MDF_Decoders/group"/>
+      <unit bldFile="os\mm\video\arm_MDF_decoders\group"/>
      </component>
     </collection>
    </block>
@@ -1574,12 +1606,12 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="H264AVCVideoEncARM" long-name="H264AVCVideoEncARM">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/imagingext/imagingmodules/H264AVCVideoEncARM/group"/>
+      <unit bldFile="os\imagingext\imagingmodules\h264avcvideoencarm\group"/>
      </component>
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Build" long-name="Build">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/imagingext/imagingmodules/VideoEncPluginARM/Build"/>
+      <unit bldFile="os\imagingext\imagingmodules\videoencpluginarm\Build"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -1587,7 +1619,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imagingext" long-name="imagingext">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/imagingext/group"/>
+      <unit bldFile="os\imagingext\group"/>
      </component>
     </collection>
    </block>
@@ -1597,7 +1629,7 @@
      </component>
      <component name="eglinterface" long-name="EGL Interface" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
+            <unit bldFile="os\graphics\egl\eglinterface\group" mrp="os\graphics\egl\eglinterface\group\graphics_eglheaders.mrp"/>
      </component>
     </collection>
     <collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
@@ -1605,52 +1637,62 @@
     </collection>
     <collection name="graphicscomposition" long-name="Graphics Composition" level="engines">
      <component name="compositionengineadaptation" long-name="Composition Engine Adaptation" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\graphics\graphicscomposition\compositionengineadaptation\group" mrp="os\graphics\graphicscomposition\compositionengineadaptation\group\graphics_compositionbackend.mrp"/>
      </component>
      <component name="graphicscompositionengine" long-name="Graphics Composition Engine" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\graphics\graphicscomposition\graphicscompositionengine\group" mrp="os\graphics\graphicscomposition\graphicscompositionengine\group\graphics_gce.mrp"/>
      </component>
      <component name="surfaceupdate" long-name="Surface Update" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\graphics\graphicscomposition\surfaceupdate\group" mrp="os\graphics\graphicscomposition\surfaceupdate\group\graphics_surfaceupdate.mrp"/>
      </component>
     </collection>
     <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
      <component name="bitgdi" long-name="BitGDI">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
+            <unit bldFile="os\graphics\graphicsdeviceinterface\bitgdi\group" mrp="os\graphics\graphicsdeviceinterface\bitgdi\group\graphics_bitgdi.mrp"/>
      </component>
      <component name="colourpalette" long-name="Colour Palette" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
+            <unit bldFile="os\graphics\graphicsdeviceinterface\colourpalette\group" mrp="os\graphics\graphicsdeviceinterface\colourpalette\group\graphics_palette.mrp"/>
      </component>
      <component name="screendriver" long-name="Screen Driver" plugin="Y" introduced="6.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/graphicsdeviceinterface/screendriver/group" mrp="os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
+            <unit bldFile="os\graphics\graphicsdeviceinterface\screendriver\group" mrp="os\graphics\graphicsdeviceinterface\screendriver\group\graphics_screendriver.mrp"/>
      </component>
     </collection>
     <collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
      <component name="surfacemgr" long-name="Surface Manager" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\graphics\graphicshwdrivers\surfacemgr\group" mrp="os\graphics\graphicshwdrivers\surfacemgr\group\graphics_surfacemanager.mrp"/>
      </component>
     </collection>
     <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines"/>
     <collection name="graphicstest" long-name="Graphics Test" level="app-if">
      <component name="graphicstestharness" long-name="Graphics Test Harness" class="test" introduced="8.1">
-      <unit mrp="os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
+      <unit mrp="os\graphics\graphicstest\graphicstestharness\group\graphics_testharness.mrp"/>
      </component>
      <component name="uibench" long-name="UI Bench" introduced="9.2" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
+            <unit bldFile="os\graphics\graphicstest\uibench\group" mrp="os\graphics\graphicstest\uibench\group\graphics_ui_bench.mrp"/>
      </component>
     </collection>
     <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
      <component name="bitmapfonttools" long-name="Bitmap Font Tools" class="PC">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="gdi_tools" long-name="GDI Tools" class="PC">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
+            <unit bldFile="os\graphics\graphicstools\gdi_tools\group" mrp="os\graphics\graphicstools\gdi_tools\group\graphics_gditools.mrp"/>
      </component>
     </collection>
     <collection name="graphicsutils" long-name="Graphics Utils" level="engines">
      <component name="commongraphicsheaders" long-name="Common Graphics Headers" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\graphics\graphicsutils\commongraphicsheaders\group" mrp="os\graphics\graphicsutils\commongraphicsheaders\group\graphics_commonheader.mrp"/>
      </component>
     </collection>
     <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
@@ -1660,44 +1702,46 @@
      </component>
      <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/opengles/openglesinterface/group" mrp="os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
+            <unit bldFile="os\graphics\opengles\openglesinterface\group" mrp="os\graphics\opengles\openglesinterface\group\graphics_openglesheaders.mrp"/>
      </component>
     </collection>
     <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
      <component name="openvgimplementation" long-name="OpenVG Implementation" introduced="tb91">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\graphics\openvg\openvgimplementation\group/" mrp="os\graphics\openvg\openvgimplementation\group\graphics_openvg.mrp"/>
      </component>
      <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
+            <unit bldFile="os\graphics\openvg\openvginterface\group" mrp="os\graphics\openvg\openvginterface\group\graphics_openvgheaders.mrp"/>
      </component>
     </collection>
     <collection name="printingservices" long-name="Printing Services" level="app-if">
      <component name="printerdriversupport" long-name="Printer Driver Support">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/printingservices/printerdriversupport/group" mrp="os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
+            <unit bldFile="os\graphics\printingservices\printerdriversupport\group" mrp="os\graphics\printingservices\printerdriversupport\group\graphics_pdrstore.mrp"/>
      </component>
      <component name="printerdrivers" long-name="Printer Drivers" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/printingservices/printerdrivers/group" mrp="os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
+            <unit bldFile="os\graphics\printingservices\printerdrivers\group" mrp="os\graphics\printingservices\printerdrivers\group\graphics_printdrv.mrp"/>
      </component>
     </collection>
     <collection name="windowing" long-name="Windowing" level="app-if">
      <component name="windowserver" long-name="Window Server">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/windowing/windowserver/group" mrp="os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
+            <unit bldFile="os\graphics\windowing\windowserver\group" mrp="os\graphics\windowing\windowserver\group\graphics_wserv.mrp"/>
      </component>
     </collection>
     <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
      <component name="fontandbitmapserver" long-name="Font and Bitmap Server">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
+            <unit bldFile="os\graphics\fbs\fontandbitmapserver\group" mrp="os\graphics\fbs\fontandbitmapserver\group\graphics_fbserv.mrp"/>
      </component>
      <component name="itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" plugin="Y" introduced="tb92">
      </component>
     </collection>
     <collection name="graphics_info" long-name="Graphics Info" level="app-if">
      <component name="graphicsdocs" long-name="Graphics Documentation" class="doc">
-      <unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
+      <unit mrp="os\graphics\graphics_info\graphicsdocs\graphics_documentation.mrp"/>
      </component>
     </collection>
     <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
@@ -1708,7 +1752,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphicsaccelaration" long-name="graphicsaccelaration">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/graphics/graphicsaccelaration/group"/>
+      <unit bldFile="os\graphics\graphicsaccelaration\group"/>
      </component>
     </collection>
     <collection name="m3g" long-name="M3G" level="internal-adaptations">
@@ -1722,7 +1766,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphics" long-name="graphics">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/graphics/group"/>
+      <unit bldFile="os\graphics\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -1730,7 +1774,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphics_pub" long-name="graphics_pub">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/graphics/graphics_pub/group"/>
+      <unit bldFile="os\graphics\graphics_pub\group"/>
      </component>
     </collection>
    </block>
@@ -1740,11 +1784,11 @@
      </component>
      <component name="charconv_fw" long-name="Character Encoding and Conversion Framework">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
+            <unit bldFile="os\textandloc\charconvfw\charconv_fw\group" mrp="os\textandloc\charconvfw\charconv_fw\group\syslibs_charconv.mrp"/>
      </component>
      <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="CommonAdapter" long-name="Common Adapter">
      </component>
@@ -1770,7 +1814,7 @@
     <collection name="fontservices" long-name="Font Services" level="fonts">
      <component name="fontstore" long-name="Font Store">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
+            <unit bldFile="os\textandloc\fontservices\fontstore\group" mrp="os\textandloc\fontservices\fontstore\group\graphics_fntstore.mrp"/>
      </component>
      <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" plugin="Y">
      </component>
@@ -1778,34 +1822,34 @@
      </component>
      <component name="referencefonts" long-name="Reference Fonts" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="textshaperplugin" long-name="Text Shaper Plugin" plugin="Y" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="graphicsdevif" long-name="Graphics Device Interface" level="device">
      <component name="gdi" long-name="GDI">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/textandloc/graphicsdevif/gdi/group" mrp="os/textandloc/graphicsdevif/gdi/group/graphics_gdi.mrp"/>
+            <unit bldFile="os\textandloc\graphicsdevif\gdi\group" mrp="os\textandloc\graphicsdevif\gdi\group\graphics_gdi.mrp"/>
      </component>
     </collection>
     <collection name="textrendering" long-name="Text Rendering" level="text">
      <component name="numberformatting" long-name="Number Formatting" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/textandloc/textrendering/numberformatting/group" mrp="os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
+            <unit bldFile="os\textandloc\textrendering\numberformatting\group" mrp="os\textandloc\textrendering\numberformatting\group\app-framework_numberconversion.mrp"/>
      </component>
      <component name="textformatting" long-name="Text Formatting">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="texthandling" long-name="Text Handling">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="word" long-name="Word" class="test">
-      <unit mrp="os/textandloc/textrendering/word/group/app-framework_word.mrp"/>
+      <unit mrp="os\textandloc\textrendering\word\group\app-framework_word.mrp"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -1813,7 +1857,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="textandloc" long-name="textandloc">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/textandloc/group"/>
+      <unit bldFile="os\textandloc\group"/>
      </component>
     </collection>
    </block>
@@ -1821,28 +1865,30 @@
     <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
      <component name="buildsystemtools" long-name="Build System Tools">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/buildtools/bldsystemtools/buildsystemtools/group" mrp="os/buildtools/bldsystemtools/buildsystemtools/group/tools_build.mrp"/>
+            <unit bldFile="os\buildtools\bldsystemtools\buildsystemtools\group" mrp="os\buildtools\bldsystemtools\buildsystemtools\group\tools_build.mrp"/>
      </component>
      <component name="commonbldutils" long-name="Common Utils">
-      <unit mrp="os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
+      <unit mrp="os\buildtools\bldsystemtools\commonbldutils\tools_utils_common.mrp"/>
      </component>
      <component name="gttechviewbaseline" long-name="GT Techview Baseline">
-      <unit mrp="os/buildtools/packaging/additionalutils/gt_techview_baseline.mrp"/>
+      <unit mrp="os\buildtools\packaging\additionalutils\gt_techview_baseline.mrp"/>
       <!-- DEF087736 This is needed for generating export tables but shouldn't appear otherwise it is included in techview and gt -->
      </component>
     </collection>
     <collection name="devlib" long-name="Developer Library" level="ui">
      <component name="devlibhtml" long-name="Developer Library HTML">
-      <unit mrp="os/buildtools/devlib/devlibhelp/group/shared/developerlibrary_doc_plain_html.mrp"/>
+      <unit mrp="os\buildtools\devlib\devlibhelp\group\shared\developerlibrary_doc_plain_html.mrp"/>
      </component>
      <component name="devlibhelp" long-name="Developer Library Help">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit version="9.4" bldFile="os\buildtools\devlib\devlibhelp\group\devlib94" mrp="os\buildtools\devlib\devlibhelp\group\devlib94\developerlibrary_doc_html.mrp"/>
      </component>
      <component name="devlibsrc" long-name="Developer Library Source" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/buildtools/devlib/devlibhelp/securitysupplement/doc_source" mrp="os/buildtools/devlib/devlibhelp/developerlibrary_doc_source.mrp"/>
+            <unit bldFile="os\buildtools\devlib\devlibhelp\securitysupplement\doc_source" mrp="os\buildtools\devlib\devlibhelp\developerlibrary_doc_source.mrp"/>
      </component>
      <component name="toolsdocs" long-name="Tools Documentation">
-      <unit mrp="os/buildtools/devlib/toolsdocs/tools_documentation.mrp"/>
+      <unit mrp="os\buildtools\devlib\toolsdocs\tools_documentation.mrp"/>
      </component>
     </collection>
     <collection name="fileconv" long-name="File Converters" level="mw">
@@ -1860,10 +1906,10 @@
     <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
      <component name="autotest" long-name="Autotest">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
+            <unit bldFile="os\buildtools\toolsandutils\autotest\group" mrp="os\buildtools\toolsandutils\autotest\group\tools_autotest.mrp"/>
      </component>
      <component name="additionalredistribution" long-name="Additional Redistribution">
-      <unit mrp="os/buildtools/perltoolsplat_os/redistribution/additional_tools.mrp"/>
+      <unit mrp="os\buildtools\perltoolsplat_os\redistribution\additional_tools.mrp"/>
      </component>
      <component name="burtestserver" long-name="BUR Test Server">
      </component>
@@ -1874,24 +1920,24 @@
      <component name="cdb" long-name="Code Database">
      </component>
      <component name="ctsfunctionalitycheckers" long-name="CTS Functionality Checkers">
-      <unit mrp="os/buildtools/toolsandutils/ctsfunctionalitycheckers/Group/testtools_cts_functionalitycheckers.mrp"/>
+      <unit mrp="os\buildtools\toolsandutils\ctsfunctionalitycheckers\group\testtools_cts_functionalitycheckers.mrp"/>
      </component>
      <component name="e32tools" long-name="E32 Tools" class="PC" deprecated="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/buildtools/toolsandutils/e32tools/group" mrp="os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
+            <unit bldFile="os\buildtools\toolsandutils\e32tools\group" mrp="os\buildtools\toolsandutils\e32tools\group\tools_e32tools.mrp"/>
      </component>
      <component name="kitcomparator" long-name="Kit Comparator">
      </component>
      <component name="kitsetupapp" long-name="Kit Setup App" filter="gt">
-      <unit mrp="os/buildtools/toolsandutils/kitsetupapp/group/tools_devkits_kitsetupapp.mrp"/>
+      <unit mrp="os\buildtools\toolsandutils\kitsetupapp\group\tools_devkits_kitsetupapp.mrp"/>
      </component>
      <component name="navigationpages" long-name="Navigation Pages">
-      <unit mrp="os/buildtools/toolsandutils/navigationpages/tools_sdk_eng_NavigationPages.mrp"/>
+      <unit mrp="os\buildtools\toolsandutils\navigationpages\tools_sdk_eng_NavigationPages.mrp"/>
      </component>
      <component name="productinstaller" long-name="Product Installer" filter="gt">
      </component>
      <component name="productionbldtools" long-name="Production Build Tools" filter="gt">
-      <unit mrp="os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
+      <unit mrp="os\buildtools\toolsandutils\productionbldtools\product_tools.mrp"/>
      </component>
      <component name="statdesktop" long-name="STAT Desktop" filter="gt">
      </component>
@@ -1900,9 +1946,11 @@
      <component name="systemmonitor" long-name="System Monitor" introduced="8.0">
      </component>
      <component name="statapi" long-name="STAT API" filter="gt">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="os\buildtools\toolsandutils\statapi\source\statapi\console" mrp="os\buildtools\toolsandutils\statapi\group\testtools_stat_device_gt.mrp"/>
      </component>
      <component name="statsource" long-name="STAT Source" filter="gt">
-      <unit mrp="os/buildtools/toolsandutils/statsource/group/testtools_stat_common_source.mrp"/>
+      <unit mrp="os\buildtools\toolsandutils\statsource\group\testtools_stat_common_source.mrp"/>
      </component>
      <component name="testconfigfileparser" long-name="Test Config File Parser">
      </component>
@@ -1910,15 +1958,15 @@
      </component>
      <component name="testtoolsdesktop" long-name="Test Tools Desktop" filter="gt" deprecated="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/>
+            <unit bldFile="os\buildtools\toolsandutils\testtoolsdesktop\group" mrp="os\buildtools\toolsandutils\testtoolsdesktop\group\testtools_desktop.mrp"/>
      </component>
      <component name="usecasecontroller" long-name="Use Case Controller">
      </component>
      <component name="wincredistribution" long-name="WinC Redistribution">
-      <unit mrp="os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp"/>
+      <unit mrp="os\buildtools\dist_os\redistributionwinceka2\tools_redistribution_winc.mrp"/>
      </component>
      <component name="wintunnel" long-name="Wintunnel">
-      <unit mrp="os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp"/>
+      <unit mrp="os\buildtools\toolsandutils\wintunnel\group\testtools_WinTunnel_srconly.mrp"/>
      </component>
     </collection>
     <collection name="binanamdw_os" long-name="Binary Analysis Middleware" level="fw">
@@ -1940,7 +1988,7 @@
     <collection name="imgtools_os" long-name="Image Tools" level="fw">
      <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/buildtools/imgtools_os/romkiteka2/group" mrp="os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
+            <unit bldFile="os\buildtools\imgtools_os\romkiteka2\group" mrp="os\buildtools\imgtools_os\romkiteka2\group\tools_romkit.mrp"/>
      </component>
     </collection>
     <collection name="misccomponents" long-name="Misc Components" level="mw">
@@ -1950,7 +1998,7 @@
      </component>
      <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/buildtools/misccomponents/emulatorlauncher/group" mrp="os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
+            <unit bldFile="os\buildtools\misccomponents\emulatorlauncher\group" mrp="os\buildtools\misccomponents\emulatorlauncher\group\tools_sdk_eng_emulator_launcher.mrp"/>
      </component>
      <component name="enum" long-name="Enum" filter="gt">
      </component>
@@ -2001,7 +2049,7 @@
     </collection>
     <collection name="packaging" long-name="Packaging" level="ui">
      <component name="additionalutils" long-name="Additional Utils">
-      <unit mrp="os/buildtools/packaging/additionalutils/additional_unknown_cedar.mrp"/>
+      <unit mrp="os\buildtools\packaging\additionalutils\additional_unknown_cedar.mrp"/>
      </component>
      <component name="dummy" long-name="Dummy">
      </component>
@@ -2018,7 +2066,7 @@
      <component name="bldtools" long-name="Build Tools" filter="gt">
      </component>
      <component name="e32toolp" long-name="E32 Perl Tools" class="PC">
-      <unit mrp="os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp"/>
+      <unit mrp="os\buildtools\sbsv1_os\e32toolp\group\tools_e32toolp.mrp"/>
      </component>
     </collection>
     <collection name="srcanamdw_os" long-name="Source Analysis Middleware" level="fw">
@@ -2034,15 +2082,15 @@
     <collection name="xml" long-name="XML" level="generic">
      <component name="wbxmlparser" long-name="WBXML Parser" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="xmlexpatparser" long-name="XML Expat Parser" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="xmlfw" long-name="XML Framework" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="xmlengine" long-name="XML Engine" level="server">
@@ -2072,7 +2120,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="xmlsrv" long-name="xmlsrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/xmlsrv/group"/>
+      <unit bldFile="os\xmlsrv\group"/>
      </component>
     </collection>
    </block>
@@ -2083,7 +2131,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="S60Extras" long-name="S60Extras">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/deviceplatformrelease/S60Extras/group"/>
+      <unit bldFile="os\deviceplatformrelease\s60extras\group"/>
      </component>
     </collection>
     <collection name="S60Helps" long-name="S60 Helps" level="mid">
@@ -2092,7 +2140,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="S60Helps" long-name="S60Helps">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/deviceplatformrelease/S60Helps/Group"/>
+      <unit bldFile="os\deviceplatformrelease\s60helps\group"/>
      </component>
     </collection>
     <collection name="S60LocFiles" long-name="S60 Loc Files" level="mid">
@@ -2101,7 +2149,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="S60LocFiles" long-name="S60LocFiles">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/deviceplatformrelease/S60LocFiles/group"/>
+      <unit bldFile="os\deviceplatformrelease\s60locfiles\group"/>
      </component>
     </collection>
     <collection name="Version" long-name="Version" level="top">
@@ -2110,20 +2158,20 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Version" long-name="Version">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="os/deviceplatformrelease/Version/group"/>
+      <unit bldFile="os\deviceplatformrelease\version\group"/>
      </component>
     </collection>
     <collection name="foundation_system" long-name="Foundation System" level="top">
      <component name="systemdocs" long-name="System Documentation" class="doc">
-      <unit mrp="os/deviceplatformrelease/foundation_system/systemdocs/group/system.mrp"/>
+      <unit mrp="os\deviceplatformrelease\foundation_system\systemdocs\group\system.mrp"/>
      </component>
     </collection>
     <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
      <component name="cedarutils" long-name="Cedar Utils">
-      <unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
+      <unit mrp="os\deviceplatformrelease\symbianosbld\cedarutils\tools_utils_cedar.mrp"/>
      </component>
      <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt">
-      <unit mrp="os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
+      <unit mrp="os\deviceplatformrelease\symbianosbld\productionbldcbrconfig\product_cbr_config.mrp"/>
      </component>
     </collection>
    </block>
@@ -2167,11 +2215,11 @@
     <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
      <component name="cinidata" long-name="CINI Data">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/osrndtools/testexecfw1/cinidata" mrp="os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/>
+            <unit bldFile="os\osrndtools\testexecfw1\cinidata" mrp="os\osrndtools\testexecfw1\cinidata\tools_cinidata.mrp"/>
      </component>
      <component name="testexecute" long-name="Test Execute" deprecated="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="os/osrndtools/testexecfw1/testexecute/Group" mrp="os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
+            <unit bldFile="os\osrndtools\testexecfw1\testexecute\Group" mrp="os\osrndtools\testexecfw1\testexecute\group\tools_testexecute.mrp"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -2179,7 +2227,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="osrndtools" long-name="osrndtools">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="ostools/osrndtools/group"/>
+      <unit bldFile="ostools\osrndtools\group"/>
      </component>
     </collection>
    </block>
@@ -2193,7 +2241,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="swconfigtools" long-name="swconfigtools">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="tools/swconfigtools/group"/>
+      <unit bldFile="tools\swconfigtools\group"/>
      </component>
     </collection>
    </block>
@@ -2203,125 +2251,131 @@
     <collection name="appfw" long-name="Application Framework" level="framework">
      <component name="apparchitecture" long-name="Application Architecture">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="uiftestfw" long-name="UIF Test Framework" class="test" introduced="9.2">
-      <unit mrp="mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp"/>
+      <unit mrp="mw\appsupport\appfw\uiftestfw\group\app-framework_testframework.mrp"/>
      </component>
      <component name="viewserver" long-name="View Server" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="applaunchservices" long-name="Application Launch Services" level="generic"/>
     <collection name="commonappservices" long-name="Common Application Services" level="framework">
      <component name="alarmserver" long-name="Alarm Server" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/appsupport/commonappservices/alarmserver/Group" mrp="mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
+            <unit bldFile="mw\appsupport\commonappservices\alarmserver\Group" mrp="mw\appsupport\commonappservices\alarmserver\group\app-services_alarmserver.mrp"/>
      </component>
      <component name="alarmservertest" long-name="Alarm Server Test" introduced="8.1" class="test" deprecated="tb92">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="appservicesdocs" long-name="Application Services Documentation" 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">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="coreappstest" long-name="Core Apps Test" introduced="8.1" class="test">
-      <!-- XML Previous Location: Application Services/Other Application Services/ -->
-      <unit mrp="mw/appsupport/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp"/>
+      <!-- XML Previous Location: Application services\other Application Services/ -->
+      <unit mrp="mw\appsupport\commonappservices\coreappstest\group\app-services_CoreAppsTest.mrp"/>
      </component>
     </collection>
     <collection name="contenthandling" long-name="Content Handling" level="plugin">
      <component name="contenthandlingfw" long-name="Content Handling Framework" introduced="8.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/appsupport/contenthandling/contenthandlingfw/Group" mrp="mw/appsupport/contenthandling/contenthandlingfw/Group/content-handling.mrp"/>
+            <unit bldFile="mw\appsupport\contenthandling\contenthandlingfw\Group" mrp="mw\appsupport\contenthandling\contenthandlingfw\group\content-handling.mrp"/>
      </component>
      <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw\appsupport\contenthandling\referencedrmagent\reftestagent\group" mrp="mw\appsupport\contenthandling\referencedrmagent\reftestagent\group\security_rta.mrp"/>
      </component>
      <component name="webrecognisers" long-name="Web Recognisers" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="filehandling" long-name="File Handling" level="server">
      <component name="fileconverterfw" long-name="File Converter Framework">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" plugin="Y" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="fileconverterplugins" long-name="Other File Converter Plugins" plugin="Y" introduced="5.0" deprecated="9.3">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/appsupport/filehandling/fileconverterplugins/group" mrp="mw/appsupport/filehandling/fileconverterplugins/group/app-engines_convert.mrp"/>
+            <unit bldFile="mw\appsupport\filehandling\fileconverterplugins\group" mrp="mw\appsupport\filehandling\fileconverterplugins\group\app-engines_convert.mrp"/>
      </component>
      <component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="openenvutils" long-name="Open Environment Utilities" level="specific">
      <component name="commandshell" long-name="Command Shell" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw\appsupport\openenvutils\commandshell\group" mrp="mw\appsupport\openenvutils\commandshell\group\oetools_zsh.mrp"/>
      </component>
      <component name="telnetserver" long-name="Telnet Server" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <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">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="sensorsupport" long-name="Sensor Support" level="generic"/>
     <collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
      <component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" class="config PC">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" class="config PC">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" class="config PC">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="tzservices" long-name="Time Zone Services" level="plugin">
      <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" class="config">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="tzloc" long-name="Time Zone Localization" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" class="config">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="tzserver" long-name="Time Zone Server" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="worldserver" long-name="World Server" introduced="7.0" deprecated="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="contextframework" long-name="Context Framework" level="framework">
@@ -2407,7 +2461,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appsupport" long-name="appsupport">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/appsupport/group"/>
+      <unit bldFile="mw\appsupport\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -2415,12 +2469,12 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="flash_mmi_service_interface_custom_api" long-name="flash_mmi_service_interface_custom_api">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
+      <unit bldFile="mw\appsupport\appsupport_plat\flash_mmi_service_interface_custom_api\group"/>
      </component>
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="flash_netscape_plugin_command_api" long-name="flash_netscape_plugin_command_api">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
+      <unit bldFile="mw\appsupport\appsupport_plat\flash_netscape_plugin_command_api\group"/>
      </component>
     </collection>
    </block>
@@ -2471,7 +2525,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="Certificates_OEM" long-name="Certificates_OEM">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/securitysrv/pkiutilities/Certificates_OEM/group"/>
+      <unit bldFile="mw\securitysrv\pkiutilities\certificates_oem\group"/>
      </component>
     </collection>
     <collection name="remotelock" long-name="Remote Lock" level="server">
@@ -2511,7 +2565,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="securitysrv" long-name="securitysrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/securitysrv/group"/>
+      <unit bldFile="mw\securitysrv\group"/>
      </component>
     </collection>
    </block>
@@ -2553,7 +2607,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm" long-name="drm">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/drm/group"/>
+      <unit bldFile="mw\drm\group"/>
      </component>
     </collection>
    </block>
@@ -2579,7 +2633,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="accesssec" long-name="accesssec">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/accesssec/group"/>
+      <unit bldFile="mw\accesssec\group"/>
      </component>
     </collection>
    </block>
@@ -2633,7 +2687,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="locationsrv" long-name="locationsrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/locationsrv/group"/>
+      <unit bldFile="mw\locationsrv\group"/>
      </component>
     </collection>
    </block>
@@ -2693,7 +2747,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipconnmgmt" long-name="ipconnmgmt">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/ipconnmgmt/group"/>
+      <unit bldFile="mw\ipconnmgmt\group"/>
      </component>
     </collection>
    </block>
@@ -2701,45 +2755,45 @@
     <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
      <component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+            <unit bldFile="mw\netprotocols\applayerpluginsandutils\bookmarksupport\group" mrp="mw\netprotocols\applayerpluginsandutils\bookmarksupport\group\application-protocols_bookmarks.mrp"/>
      </component>
      <component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" plugin="Y" introduced="6.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+            <unit bldFile="mw\netprotocols\applayerpluginsandutils\httpprotocolplugins\group" mrp="mw\netprotocols\applayerpluginsandutils\httpprotocolplugins\group\http_protocol-plugin.mrp"/>
      </component>
      <component name="httptransportplugins" long-name="HTTP Transport Plugins" plugin="Y" introduced="6.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
      <component name="ftpengine" long-name="FTP Engine" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="httpexamples" long-name="HTTP Examples" introduced="6.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="telnetengine" long-name="Telnet Engine" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="wapbase" long-name="WAP Base" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="wappushsupport" long-name="WAP Push Support" introduced="6.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="wapstack" long-name="WAP Stack" level="plugin">
@@ -2771,44 +2825,46 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="netprotocols" long-name="netprotocols">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/netprotocols/group"/>
+      <unit bldFile="mw\netprotocols\group"/>
      </component>
     </collection>
    </block>
    <block long-name="IP App Protocols" level="generic" name="ipappprotocols" levels="plugin framework server generic specific">
     <collection name="sipconnproviderplugins" long-name="SIP Connection Provider Plugins" level="conn">
      <component name="sipconnectionplugins" long-name="SIP Connection Plugins" plugin="Y" introduced="tb92" filter="gt">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipconnectionplugins\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipconnectionplugins\group\mm-protocols_sipproviders.mrp"/>
      </component>
      <component name="sipconnprovider" long-name="SIP Connection Provider" plugin="Y" introduced="9.2" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipconnprovider/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipconnprovider/group/mm-protocols_SIPCPR.mrp"/>
+            <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipconnprovider\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipconnprovider\group\mm-protocols_SIPCPR.mrp"/>
      </component>
      <component name="sipdummyprt" long-name="SIP Dummy PRT" plugin="Y" introduced="9.2" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipdummyprt/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipdummyprt/group/mm-protocols_SIPDummyPRT.mrp"/>
+            <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipdummyprt\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipdummyprt\group\mm-protocols_SIPDummyPRT.mrp"/>
      </component>
      <component name="sipparams" long-name="SIP Params" plugin="Y" introduced="9.2" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipparams/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipparams/group/mm-protocols_SIPParams.mrp"/>
+            <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipparams\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipparams\group\mm-protocols_SIPParams.mrp"/>
      </component>
      <component name="sipstatemachine" long-name="SIP State Machine" introduced="9.2" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipstatemachine/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipstatemachine/group/mm-protocols_SipStateMachine.mrp"/>
+            <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipstatemachine\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipstatemachine\group\mm-protocols_SipStateMachine.mrp"/>
      </component>
      <component name="sipsubconnprovider" long-name="SIP Subconnection Provider" plugin="Y" introduced="9.2" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipsubconnprovider/group" mrp="mw/ipappprotocols/sipconnproviderplugins/sipsubconnprovider/group/mm-protocols_SIPSCPR.mrp"/>
+            <unit bldFile="mw\ipappprotocols\sipconnproviderplugins\sipsubconnprovider\group" mrp="mw\ipappprotocols\sipconnproviderplugins\sipsubconnprovider\group\mm-protocols_SIPSCPR.mrp"/>
      </component>
     </collection>
     <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
      <component name="rtp" long-name="RTP" introduced="9.0">
       <!-- Real Time Data Protocol -->
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.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" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit version="2" bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
+            <unit version="2" bldFile="mw\ipappprotocols\realtimenetprots\sipfw\Group" mrp="mw\ipappprotocols\realtimenetprots\sipfw\group\mm-protocols_SIP2_Com.mrp"/>
      </component>
     </collection>
     <collection name="rtp" long-name="RTP" level="server">
@@ -2834,7 +2890,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipappprotocols" long-name="ipappprotocols">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/ipappprotocols/group"/>
+      <unit bldFile="mw\ipappprotocols\group"/>
      </component>
     </collection>
    </block>
@@ -2880,7 +2936,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wirelessacc" long-name="wirelessacc">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/wirelessacc/group"/>
+      <unit bldFile="mw\wirelessacc\group"/>
      </component>
     </collection>
    </block>
@@ -3072,7 +3128,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ipappsrv" long-name="ipappsrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/ipappsrv/group"/>
+      <unit bldFile="mw\ipappsrv\group"/>
      </component>
     </collection>
    </block>
@@ -3111,7 +3167,7 @@
      <component name="networkhandlingengine" long-name="Network Handling Engine">
      </component>
     </collection>
-    <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
+    <collection name="phoneclientserver" long-name="Phone client\server" level="server">
      <component name="CallUI" long-name="Call UI">
      </component>
      <component name="EnPolicy" long-name="En Policy">
@@ -3148,7 +3204,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phonesrv" long-name="phonesrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/phonesrv/group"/>
+      <unit bldFile="mw\phonesrv\group"/>
      </component>
     </collection>
    </block>
@@ -3156,37 +3212,37 @@
     <collection name="messagingfw" long-name="Messaging FW" level="fw">
      <component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="biowatchers" long-name="BIO Watchers" plugin="Y" introduced="8.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/messagingmw/messagingfw/biowatchers/Group" mrp="mw/messagingmw/messagingfw/biowatchers/Group/messaging_biomsg_biowatchers_cdma.mrp"/>
+            <unit bldFile="mw\messagingmw\messagingfw\biowatchers\Group" mrp="mw\messagingmw\messagingfw\biowatchers\group\messaging_biomsg_biowatchers_cdma.mrp"/>
      </component>
      <component name="msgsrvnstore" long-name="Message Server and Store">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="msgurlhandler" long-name="Message URL Handler" introduced="7.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="msgconf" long-name="Messaging Config" introduced="tb91" class="config">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="msgtest" long-name="Messaging Test">
-      <!-- XML Previous Location: Application Services/Messaging Application Support/ -->
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
+      <!-- XML Previous Location: Application services\messaging Application Support/ -->
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw\messagingmw\messagingfw\msgtest\group" mrp="mw\messagingmw\messagingfw\msgtest\group\messaging_test.mrp"/>
      </component>
      <component name="msgtestfw" long-name="Messaging Test Framework" deprecated="tb92">
-      <unit mrp="mw/messagingmw/messagingfw/msgtestfw/group/messaging_testframework.mrp"/>
+      <unit mrp="mw\messagingmw\messagingfw\msgtestfw\group\messaging_testframework.mrp"/>
      </component>
      <component name="msgtestproduct" long-name="Messaging Test Product">
-      <unit mrp="mw/messagingmw/messagingfw/msgtestproduct/group/messaging_testproduct.mrp"/>
+      <unit mrp="mw\messagingmw\messagingfw\msgtestproduct\group\messaging_testproduct.mrp"/>
      </component>
      <component name="msgtests" long-name="Messaging Tests">
-      <unit mrp="mw/messagingmw/messagingfw/msgtests/group/messaging.mrp"/>
+      <unit mrp="mw\messagingmw\messagingfw\msgtests\group\messaging.mrp"/>
      </component>
      <component name="suplsmshandler" long-name="SUPL SMS Handler" plugin="Y" introduced="tb92">
      </component>
@@ -3194,19 +3250,19 @@
      </component>
      <component name="scheduledsendmtm" long-name="Scheduled Send MTM" plugin="Y" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="sendas" long-name="Send As">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="wappushfw" long-name="WAP Push Framework" introduced="6.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="watcherfw" long-name="Watcher Framework">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="alwaysonline" long-name="Always Online">
      </component>
@@ -3222,7 +3278,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messagingmw" long-name="messagingmw">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/messagingmw/group"/>
+      <unit bldFile="mw\messagingmw\group"/>
      </component>
     </collection>
    </block>
@@ -3258,7 +3314,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imsrv" long-name="imsrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/imsrv/group"/>
+      <unit bldFile="mw\imsrv\group"/>
      </component>
     </collection>
    </block>
@@ -3318,7 +3374,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="legacypresence" long-name="legacypresence">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/legacypresence/group"/>
+      <unit bldFile="mw\legacypresence\group"/>
      </component>
     </collection>
    </block>
@@ -3332,7 +3388,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="opensrv" long-name="opensrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/opensrv/group"/>
+      <unit bldFile="mw\opensrv\group"/>
      </component>
     </collection>
    </block>
@@ -3340,7 +3396,7 @@
     <collection name="remotemgmttest" long-name="Remote Management Test" level="specific">
      <component name="omadevicemgmtintegrationtest" long-name="OMA Device Management Integration Test" introduced="9.1" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/>
+            <unit bldFile="mw\remotemgmt\remotemgmttest\omadevicemgmtintegrationtest\group" mrp="mw\remotemgmt\remotemgmttest\omadevicemgmtintegrationtest\group\devprov_integtest.mrp"/>
      </component>
      <component name="omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" class="test">
      </component>
@@ -3408,7 +3464,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remotemgmt" long-name="remotemgmt">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/remotemgmt/group"/>
+      <unit bldFile="mw\remotemgmt\group"/>
      </component>
     </collection>
    </block>
@@ -3434,7 +3490,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="networkingdm" long-name="networkingdm">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/networkingdm/group"/>
+      <unit bldFile="mw\networkingdm\group"/>
      </component>
     </collection>
    </block>
@@ -3462,7 +3518,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remotestorage" long-name="remotestorage">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/remotestorage/group"/>
+      <unit bldFile="mw\remotestorage\group"/>
      </component>
     </collection>
    </block>
@@ -3470,47 +3526,49 @@
     <collection name="connectivitypcside" long-name="Connectivity PC Side" level="generic">
      <component name="chatscripts" long-name="Chat Scripts">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" class="PC">
-      <unit mrp="mw/remoteconn/connectivitypcside/connectqi/connectqisdk_mr3.mrp"/>
+      <unit mrp="mw\remoteconn\connectivitypcside\connectqi\connectqisdk_mr3.mrp"/>
      </component>
      <component name="connectqisdk" long-name="ConnectQI SDK" introduced="9.1" class="PC">
-      <unit mrp="mw/remoteconn/connectivitypcside/connectqisdk/connectqisdk_public.mrp"/>
+      <unit mrp="mw\remoteconn\connectivitypcside\connectqisdk\connectqisdk_public.mrp"/>
      </component>
     </collection>
     <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
      <component name="eventbroadcast" long-name="Event Broadcast" deprecated="9.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/remoteconn/connectivitytransports/eventbroadcast/group" mrp="mw/remoteconn/connectivitytransports/eventbroadcast/group/connectivity_legacy_brdcst.mrp"/>
+            <unit bldFile="mw\remoteconn\connectivitytransports\eventbroadcast\group" mrp="mw\remoteconn\connectivitytransports\eventbroadcast\group\connectivity_legacy_brdcst.mrp"/>
      </component>
      <component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/plpgrp" mrp="mw/remoteconn/connectivitytransports/plpremotelink/plpgrp/connectivity_legacy_plp_plpgrp.mrp"/>
+            <unit bldFile="mw\remoteconn\connectivitytransports\plpremotelink\plpgrp" mrp="mw\remoteconn\connectivitytransports\plpremotelink\plpgrp\connectivity_legacy_plp_plpgrp.mrp"/>
      </component>
      <component name="plpvariant" long-name="PLP Variant" deprecated="9.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/plpvariant" mrp="mw/remoteconn/connectivitytransports/plpremotelink/plpvariant/connectivity_legacy_plp_plpvariant.mrp"/>
+            <unit bldFile="mw\remoteconn\connectivitytransports\plpremotelink\plpvariant" mrp="mw\remoteconn\connectivitytransports\plpremotelink\plpvariant\connectivity_legacy_plp_plpvariant.mrp"/>
      </component>
      <component name="mrouter" long-name="m-Router" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
      <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" plugin="Y" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="usbfunctiondrivers" long-name="USB Function Drivers" level="server">
      <component name="massstoragemgr" long-name="Mass Storage Manager" introduced="tb92">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="mw\remoteconn\usbfunctiondrivers\massstoragemgr\group" mrp="mw\remoteconn\usbfunctiondrivers\massstoragemgr\group\connectivity_usbms.mrp"/>
      </component>
     </collection>
     <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
      <component name="backupengine" long-name="Backup Engine" introduced="9.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
@@ -3520,17 +3578,17 @@
     <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
      <component name="mtpfw" long-name="MTP Framework" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="mtptransports" long-name="MTP Transports" level="plugin">
      <component name="mtpusbtransport" long-name="MTP USB Transport" plugin="Y" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from System Definition Template -->
@@ -3538,12 +3596,12 @@
      <!-- Following Component added by SF via autopopulating script from System Definition Template -->
      <component name="connectivityfw" long-name="connectivityfw">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/connectivityapps/connectivityfw/group" mrp="app/techview/connectivityapps/connectivityfw/group/connectivity_framework.mrp"/>
+            <unit bldFile="app\techview\connectivityapps\connectivityfw\group" mrp="app\techview\connectivityapps\connectivityfw\group\connectivity_framework.mrp"/>
      </component>
      <!-- Following Component added by SF via autopopulating script from System Definition Template -->
      <component name="connectivityservices" long-name="connectivityservices">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/connectivityapps/connectivityservices/group" mrp="app/techview/connectivityapps/connectivityservices/group/connectivity_services.mrp"/>
+            <unit bldFile="app\techview\connectivityapps\connectivityservices\group" mrp="app\techview\connectivityapps\connectivityservices\group\connectivity_services.mrp"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -3551,7 +3609,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="remoteconn" long-name="remoteconn">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/remoteconn/group"/>
+      <unit bldFile="mw\remoteconn\group"/>
      </component>
     </collection>
    </block>
@@ -3567,18 +3625,18 @@
      <component name="contentmanager" long-name="Content Manager">
      </component>
     </collection>
-    <collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="server">
-     <component name="upnpavcontrollerclient" long-name="UPnP A/V Ccontroller Client">
-     </component>
-     <component name="upnpavcontrollerhelper" long-name="UPnP A/V Controller Helper">
-     </component>
-     <component name="upnpavcontrollerserver" long-name="UPnP A/V Controller Server">
+    <collection name="upnpavcontroller" long-name="UPnP a\v Controller" level="server">
+     <component name="upnpavcontrollerclient" long-name="UPnP a\v Ccontroller Client">
+     </component>
+     <component name="upnpavcontrollerhelper" long-name="UPnP a\v Controller Helper">
+     </component>
+     <component name="upnpavcontrollerserver" long-name="UPnP a\v Controller Server">
      </component>
      <component name="upnpxmlparser" long-name="UPnP XML Parser">
      </component>
     </collection>
-    <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-     <component name="avcontrolframework" long-name="A/V Control Famework">
+    <collection name="upnpavcontrolpoint" long-name="UPnP a\v Control Point" level="plugin">
+     <component name="avcontrolframework" long-name="a\v Control Famework">
      </component>
      <component name="avcpengine" long-name="AVCP Engine">
      </component>
@@ -3616,7 +3674,7 @@
      </component>
     </collection>
     <collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-     <component name="avobjects" long-name="A/V Objects">
+     <component name="avobjects" long-name="a\v Objects">
      </component>
      <component name="connectionmanagerservice" long-name="Connection Manager Service">
      </component>
@@ -3678,7 +3736,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dlnasrv" long-name="dlnasrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/dlnasrv/group"/>
+      <unit bldFile="mw\dlnasrv\group"/>
      </component>
     </collection>
    </block>
@@ -3686,17 +3744,17 @@
     <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
      <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="obex" long-name="OBEX" level="generic">
      <component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
@@ -3758,7 +3816,7 @@
      </component>
      <component name="usbosdescriptorhandler" long-name="USB Os Descriptor Handler">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/shortlinkconn/usbclasses/usbosdescriptorhandler/group"/>
+      <unit bldFile="mw\shortlinkconn\usbclasses\usbosdescriptorhandler\group"/>
      </component>
     </collection>
     <collection name="usbengines" long-name="USB Engines" level="generic">
@@ -3786,7 +3844,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="shortlinkconn" long-name="shortlinkconn">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/shortlinkconn/group"/>
+      <unit bldFile="mw\shortlinkconn\group"/>
      </component>
     </collection>
    </block>
@@ -3814,7 +3872,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imghandling" long-name="imghandling">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/imghandling/group"/>
+      <unit bldFile="mw\imghandling\group"/>
      </component>
     </collection>
    </block>
@@ -3850,7 +3908,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="metadatasrv" long-name="metadatasrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/metadatasrv/group"/>
+      <unit bldFile="mw\metadatasrv\group"/>
      </component>
     </collection>
    </block>
@@ -3906,7 +3964,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mds" long-name="mds">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/mds/group"/>
+      <unit bldFile="mw\mds\group"/>
      </component>
     </collection>
    </block>
@@ -3958,7 +4016,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmuifw" long-name="mmuifw">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/mmuifw/group"/>
+      <unit bldFile="mw\mmuifw\group"/>
      </component>
     </collection>
    </block>
@@ -3986,7 +4044,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoutils" long-name="videoutils">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/videoutils/group"/>
+      <unit bldFile="mw\videoutils\group"/>
      </component>
     </collection>
    </block>
@@ -3994,42 +4052,42 @@
     <collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
      <component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" class="test">
-      <unit mrp="mw/mmmw/mmfwtest/mmfintegrationtest/group/multimedia_inttest_mmf_source.mrp"/>
+      <unit mrp="mw\mmmw\mmfwtest\mmfintegrationtest\group\multimedia_inttest_mmf_source.mrp"/>
      </component>
      <component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" class="test">
-      <unit mrp="mw/mmmw/mmfwtest/mmfunittest/group/multimedia_unittest_mmf_source.mrp"/>
+      <unit mrp="mw\mmmw\mmfwtest\mmfunittest\group\multimedia_unittest_mmf_source.mrp"/>
      </component>
     </collection>
     <collection name="mmmiddlewarefws" long-name="Multimedia Middleware Frameworks" level="server">
      <component name="mmfw" long-name="Multimedia Framework" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group/multimedia_mmf.mrp"/>
+            <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\group" mrp="mw\mmmw\mmmiddlewarefws\mmfw\group\multimedia_mmf.mrp"/>
      </component>
      <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/mmmw/mmmiddlewarefws/mmutilitylib/group" mrp="mw/mmmw/mmmiddlewarefws/mmutilitylib/group/multimedia_common.mrp"/>
+            <unit bldFile="mw\mmmw\mmmiddlewarefws\mmutilitylib\group" mrp="mw\mmmw\mmmiddlewarefws\mmutilitylib\group\multimedia_common.mrp"/>
      </component>
     </collection>
     <collection name="mmmiddlewareplugins" long-name="Multimedia Middleware Plugins" level="framework">
      <component name="mmfwplugins" long-name="Multimedia Framework Plugins" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
      <component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" class="test">
-      <unit mrp="mw/mmmw/mmvalidationsuite/mvsintegrationtest/group/multimedia_inttest_mvs_source.mrp"/>
+      <unit mrp="mw\mmmw\mmvalidationsuite\mvsintegrationtest\group\multimedia_inttest_mvs_source.mrp"/>
      </component>
      <component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="advancedaudiocontroller" long-name="Advanced Audio Controller" level="plugin">
@@ -4082,7 +4140,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mtp" long-name="mtp">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/mmmw/mtp/group"/>
+      <unit bldFile="mw\mmmw\mtp\group"/>
      </component>
     </collection>
     <collection name="radioutility" long-name="Radio Utility" level="generic">
@@ -4102,7 +4160,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmmw" long-name="mmmw">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/mmmw/group"/>
+      <unit bldFile="mw\mmmw\group"/>
      </component>
     </collection>
    </block>
@@ -4114,7 +4172,7 @@
      </component>
      <component name="src" long-name="Src">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/helix/helix_ren/src/group"/>
+      <unit bldFile="mw\helix\helix_ren\src\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -4122,7 +4180,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="helix" long-name="helix">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/helix/group"/>
+      <unit bldFile="mw\helix\group"/>
      </component>
     </collection>
    </block>
@@ -4152,7 +4210,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camerasrv" long-name="camerasrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/camerasrv/group"/>
+      <unit bldFile="mw\camerasrv\group"/>
      </component>
     </collection>
    </block>
@@ -4186,7 +4244,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmappfw" long-name="mmappfw">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/mmappfw/group"/>
+      <unit bldFile="mw\mmappfw\group"/>
      </component>
     </collection>
    </block>
@@ -4194,7 +4252,7 @@
     <collection name="fep" long-name="FEP" level="engine">
      <component name="frontendprocessor" long-name="Front End Processor">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="aknfep" long-name="AKN FEP">
      </component>
@@ -4260,7 +4318,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="inputmethods" long-name="inputmethods">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/inputmethods/group"/>
+      <unit bldFile="mw\inputmethods\group"/>
      </component>
     </collection>
    </block>
@@ -4268,48 +4326,48 @@
     <collection name="commonuisupport" long-name="Common UI Support" level="support">
      <component name="errorresolverdata" long-name="Error Resolver Data">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="grid" long-name="Grid">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/classicui/commonuisupport/grid/group" mrp="mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
+            <unit bldFile="mw\classicui\commonuisupport\grid\group" mrp="mw\classicui\commonuisupport\grid\group\app-framework_grid.mrp"/>
      </component>
      <component name="uifwsdocs" long-name="UI Frameworks Documentation" class="doc">
-      <unit mrp="mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
+      <unit mrp="mw\classicui\commonuisupport\uifwsdocs\app-framework_documentation.mrp"/>
      </component>
      <component name="uilaf" long-name="UI Look and Feel" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="uikon" long-name="Uikon" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
      <component name="animation" long-name="Animation" introduced="9.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="bmpanimation" long-name="BMP Animation" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="clockanim" long-name="Clock" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="cone" long-name="Control Environment">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/classicui/lafagnosticuifoundation/cone/group" mrp="mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
+            <unit bldFile="mw\classicui\lafagnosticuifoundation\cone\group" mrp="mw\classicui\lafagnosticuifoundation\cone\group\app-framework_cone.mrp"/>
      </component>
      <component name="graphicseffects" long-name="Graphics Effects" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
+            <unit bldFile="mw\classicui\lafagnosticuifoundation\graphicseffects\group" mrp="mw\classicui\lafagnosticuifoundation\graphicseffects\group\app-framework_gfxtranseffect.mrp"/>
      </component>
      <component name="uigraphicsutils" long-name="UI Graphics Utilities">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
@@ -4357,7 +4415,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="classicui" long-name="classicui">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/classicui/group"/>
+      <unit bldFile="mw\classicui\group"/>
      </component>
     </collection>
    </block>
@@ -4375,7 +4433,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="svgt" long-name="svgt">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/svgt/group"/>
+      <unit bldFile="mw\svgt\group"/>
      </component>
     </collection>
    </block>
@@ -4397,7 +4455,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiaccelerator" long-name="uiaccelerator">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/uiaccelerator/group"/>
+      <unit bldFile="mw\uiaccelerator\group"/>
      </component>
     </collection>
    </block>
@@ -4465,7 +4523,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uiresources" long-name="uiresources">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/uiresources/group"/>
+      <unit bldFile="mw\uiresources\group"/>
      </component>
     </collection>
    </block>
@@ -4539,7 +4597,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homescreensrv" long-name="homescreensrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/homescreensrv/group"/>
+      <unit bldFile="mw\homescreensrv\group"/>
      </component>
     </collection>
    </block>
@@ -4547,34 +4605,34 @@
     <collection name="installationservices" long-name="Installation Services" level="generic">
      <component name="swi" long-name="Secure Software Install">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+            <unit bldFile="mw\appinstall\installationservices\swi\group" mrp="mw\appinstall\installationservices\swi\group\security_swi.mrp"/>
      </component>
      <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+            <unit bldFile="mw\appinstall\installationservices\swidevicetools\group" mrp="mw\appinstall\installationservices\swidevicetools\group\security_switools_device.mrp"/>
      </component>
      <component name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/appinstall/installationservices/switestfw/group" mrp="mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
+            <unit bldFile="mw\appinstall\installationservices\switestfw\group" mrp="mw\appinstall\installationservices\switestfw\group\install_testframework.mrp"/>
      </component>
      <component name="swiconfig" long-name="Software Install Config" introduced="9.1" class="config" purpose="optional">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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">
      <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" class="PC">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="openssllib" long-name="OpenSSL Library" class="PC">
-      <unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+      <unit mrp="mw\appinstall\secureswitools\openssllib\security_openssl.mrp"/>
      </component>
      <component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" class="PC">
      </component>
      <component name="swisistools" long-name="Secure Software Install SIS Tools" class="PC">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="mw/appinstall/secureswitools/swisistools/group" mrp="mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+            <unit bldFile="mw\appinstall\secureswitools\swisistools\group" mrp="mw\appinstall\secureswitools\swisistools\group\security_sistools.mrp"/>
      </component>
     </collection>
     <collection name="appinstaller" long-name="App Installer" level="generic">
@@ -4598,7 +4656,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="appinstall" long-name="appinstall">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/appinstall/group"/>
+      <unit bldFile="mw\appinstall\group"/>
      </component>
     </collection>
    </block>
@@ -4620,7 +4678,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="serviceapifw" long-name="serviceapifw">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/serviceapifw/group"/>
+      <unit bldFile="mw\serviceapifw\group"/>
      </component>
     </collection>
    </block>
@@ -4690,7 +4748,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="serviceapi" long-name="serviceapi">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/serviceapi/group"/>
+      <unit bldFile="mw\serviceapi\group"/>
      </component>
     </collection>
    </block>
@@ -4786,7 +4844,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="web" long-name="web">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/web/group"/>
+      <unit bldFile="mw\web\group"/>
      </component>
     </collection>
    </block>
@@ -4850,7 +4908,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="websrv" long-name="websrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/websrv/group"/>
+      <unit bldFile="mw\websrv\group"/>
      </component>
     </collection>
    </block>
@@ -4868,7 +4926,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="conntools" long-name="conntools">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/conntools/group"/>
+      <unit bldFile="app\conntools\group"/>
      </component>
     </collection>
    </block>
@@ -4884,7 +4942,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="platformtools" long-name="platformtools">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="tools/platformtools/group"/>
+      <unit bldFile="tools\platformtools\group"/>
      </component>
     </collection>
    </block>
@@ -4914,7 +4972,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="uitools" long-name="uitools">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/uitools/group"/>
+      <unit bldFile="mw\uitools\group"/>
      </component>
     </collection>
    </block>
@@ -4992,7 +5050,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="location" long-name="location">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/location/group"/>
+      <unit bldFile="app\location\group"/>
      </component>
     </collection>
    </block>
@@ -5030,7 +5088,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mmsharinguis" long-name="mmsharinguis">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/mmsharinguis/group"/>
+      <unit bldFile="app\mmsharinguis\group"/>
      </component>
     </collection>
    </block>
@@ -5096,7 +5154,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="phone" long-name="phone">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/phone/group"/>
+      <unit bldFile="app\phone\group"/>
      </component>
     </collection>
    </block>
@@ -5104,7 +5162,7 @@
     <collection name="packetvideoengine" long-name="Packetvideo Engine" level="engine">
      <component name="PacketVideoEngineBinaries" long-name="Packet Video Engine Binaries">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/videotelephony/packetvideoengine/PacketVideoEngineBinaries/group"/>
+      <unit bldFile="app\videotelephony\packetvideoengine\packetvideoenginebinaries\group"/>
      </component>
     </collection>
     <collection name="packetvideoplugins" long-name="Packetvideo Plugins" level="plugin">
@@ -5128,7 +5186,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videotelephony" long-name="videotelephony">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/videotelephony/group"/>
+      <unit bldFile="app\videotelephony\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -5136,7 +5194,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="vtprotocols" long-name="vtprotocols">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/videotelephony/vtprotocols/group"/>
+      <unit bldFile="app\videotelephony\vtprotocols\group"/>
      </component>
     </collection>
    </block>
@@ -5188,7 +5246,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="poc" long-name="poc">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/poc/group"/>
+      <unit bldFile="app\poc\group"/>
      </component>
     </collection>
    </block>
@@ -5240,7 +5298,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="iptelephony" long-name="iptelephony">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/iptelephony/group"/>
+      <unit bldFile="app\iptelephony\group"/>
      </component>
     </collection>
    </block>
@@ -5264,7 +5322,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="settingsuis" long-name="settingsuis">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/settingsuis/group"/>
+      <unit bldFile="app\settingsuis\group"/>
      </component>
     </collection>
    </block>
@@ -5292,7 +5350,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contentcontrol" long-name="contentcontrol">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/contentcontrol/group"/>
+      <unit bldFile="app\contentcontrol\group"/>
      </component>
     </collection>
    </block>
@@ -5326,7 +5384,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="devicecontrol" long-name="devicecontrol">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/devicecontrol/group"/>
+      <unit bldFile="app\devicecontrol\group"/>
      </component>
     </collection>
    </block>
@@ -5400,7 +5458,7 @@
     <collection name="PCSync" long-name="PC Sync" level="pcsuite-control">
      <component name="PCSyncNgr" long-name="PC Sync Ngr" Application="PC Sync 2" Modules="S60_PCS2_ngr">
      </component>
-     <component name="PCSyncApp" License="Other/prorietary">
+     <component name="PCSyncApp" License="other\prorietary">
      </component>
     </collection>
     <collection name="PhoneBrowser" long-name="Phone Browser" level="pcsuite">
@@ -5508,7 +5566,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="files" long-name="files">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/files/group"/>
+      <unit bldFile="app\files\group"/>
      </component>
     </collection>
    </block>
@@ -5516,11 +5574,11 @@
     <collection name="pimprotocols" long-name="PIM Protocols" level="services">
      <component name="pbap" long-name="Bluetooth PBAP" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="phonebooksync" long-name="Phonebook Sync" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="ccservices" long-name="CC Services" level="services">
@@ -5554,7 +5612,7 @@
      </component>
      <component name="contactsmodel" long-name="Contacts Model" introduced="ER5">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit version="1" bldFile="app/contacts/phonebookengines/contactsmodel/group" mrp="app/contacts/phonebookengines/contactsmodel/group/app-engines_cntmodel.mrp"/>
+            <unit version="1" bldFile="app\contacts\phonebookengines\contactsmodel\group" mrp="app\contacts\phonebookengines\contactsmodel\group\app-engines_cntmodel.mrp"/>
      </component>
      <component name="VirtualPhonebook" long-name="Virtual Phonebook">
      </component>
@@ -5592,45 +5650,47 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="contacts" long-name="contacts">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/contacts/group"/>
+      <unit bldFile="app\contacts\group"/>
      </component>
     </collection>
    </block>
    <block long-name="Organizer Application Suite" level="apps" span="2" name="organizer" levels="support services engine ui">
     <collection name="officeappeng" long-name="Office App Engines" level="engine">
      <component name="charteng" long-name="Chart" introduced="5.0" deprecated="9.3" class="test">
-      <unit mrp="app/organizer/officeappeng/charteng/group/app-engines_chart.mrp"/>
+      <unit mrp="app\organizer\officeappeng\charteng\group\app-engines_chart.mrp"/>
      </component>
      <component name="datamodel" long-name="Data Engine" introduced="5.0" deprecated="9.3">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/organizer/officeappeng/datamodel/group" mrp="app/organizer/officeappeng/datamodel/group/app-engines_damodel.mrp"/>
+            <unit bldFile="app\organizer\officeappeng\datamodel\group" mrp="app\organizer\officeappeng\datamodel\group\app-engines_damodel.mrp"/>
      </component>
      <component name="sheeteng" long-name="Sheet Engine" introduced="5.0" deprecated="9.3">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/organizer/officeappeng/sheeteng/group" mrp="app/organizer/officeappeng/sheeteng/group/app-engines_sheng.mrp"/>
+            <unit bldFile="app\organizer\officeappeng\sheeteng\group" mrp="app\organizer\officeappeng\sheeteng\group\app-engines_sheng.mrp"/>
      </component>
      <component name="wordeng" long-name="Word Engine" introduced="5.0" deprecated="9.3">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/organizer/officeappeng/wordeng/group" mrp="app/organizer/officeappeng/wordeng/group/app-engines_wpeng.mrp"/>
+            <unit bldFile="app\organizer\officeappeng\wordeng\group" mrp="app\organizer\officeappeng\wordeng\group\app-engines_wpeng.mrp"/>
      </component>
     </collection>
     <collection name="pimappservices" long-name="PIM App Services" level="services">
      <component name="agnmodel" long-name="Agenda Model" introduced="5.0" deprecated="9.1">
+      <!-- Unit added by SF via autopopulating script from System Definition Template -->
+            <unit bldFile="app\organizer\pimappservices\agnmodel\group" mrp="app\organizer\pimappservices\agnmodel\group\app-engines_agnmodel.mrp"/>
      </component>
      <component name="agendamodeltest" long-name="Agenda Model Test" introduced="8.1" class="test">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv" mrp="app/organizer/pimappservices/agendamodeltest/TestAgendaSrv/app-engines_testagendasrv.mrp"/>
+            <unit bldFile="app\organizer\pimappservices\agendamodeltest\TestAgendaSrv" mrp="app\organizer\pimappservices\agendamodeltest\testagendasrv\app-engines_testagendasrv.mrp"/>
      </component>
      <component name="calendarvcalplugin" long-name="Calendar vCal Plugin" plugin="Y" introduced="8.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit version="1" bldFile="app/organizer/pimappservices/calendarvcalplugin/group" mrp="app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit.mrp"/>
+            <unit version="1" bldFile="app\organizer\pimappservices\calendarvcalplugin\group" mrp="app\organizer\pimappservices\calendarvcalplugin\group\app-engines_agnversit.mrp"/>
      </component>
      <component name="appenginesdocs" long-name="Application Engines Documentation" class="doc">
-      <unit mrp="app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
+      <unit mrp="app\organizer\pimappservices\appenginesdocs\app-engines_documentation.mrp"/>
      </component>
      <component name="calendar" long-name="Calendar" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit version="1" bldFile="app/organizer/pimappservices/calendar/group" mrp="app/organizer/pimappservices/calendar/group/app-engines_calinterimapi.mrp"/>
+            <unit version="1" bldFile="app\organizer\pimappservices\calendar\group" mrp="app\organizer\pimappservices\calendar\group\app-engines_calinterimapi.mrp"/>
      </component>
     </collection>
     <collection name="pimappsupport" long-name="PIM Application Support" level="support">
@@ -5638,11 +5698,11 @@
      </component>
      <component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="vcardandvcal" long-name="vCard and vCal" introduced="ER5">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
     </collection>
     <collection name="alarmengines" long-name="Alarm Engines" level="engine">
@@ -5740,7 +5800,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="organizer" long-name="organizer">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/organizer/group"/>
+      <unit bldFile="app\organizer\group"/>
      </component>
     </collection>
    </block>
@@ -5748,11 +5808,11 @@
     <collection name="email" long-name="Email" level="1">
      <component name="imap4mtm" long-name="IMAP4 MTM" plugin="Y" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="alwaysonlineemailplugin" long-name="Always Online Mail Plugin">
      </component>
@@ -5768,11 +5828,11 @@
     <collection name="messagingappbase" long-name="Messaging App Base" level="2">
      <component name="obexmtms" long-name="OBEX MTMs" plugin="Y" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="smilparser" long-name="SMIL Parser" introduced="7.0s">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="bium" long-name="Bium">
      </component>
@@ -5801,11 +5861,11 @@
     </collection>
     <collection name="mmsengine" long-name="MMS Engine" level="1">
      <component name="mmsconf" long-name="MMS Configuration">
-      <unit mrp="app/messaging/mmsengine/mmssettings/group/messaging_mmssettings-config.mrp"/>
+      <unit mrp="app\messaging\mmsengine\mmssettings\group\messaging_mmssettings-config.mrp"/>
      </component>
      <component name="mmssettings" long-name="MMS Settings" introduced="9.2">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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="applicationadapter" long-name="Application Adapter">
      </component>
@@ -5835,7 +5895,7 @@
     <collection name="mobilemessaging" long-name="Mobile Messaging" level="2">
      <component name="smsmtm" long-name="SMS MTM" plugin="Y">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/messaging/mobilemessaging/smsmtm/multimode/Group" mrp="app/messaging/mobilemessaging/smsmtm/multimode/Group/messaging_sms_multimode.mrp"/>
+            <unit bldFile="app\messaging\mobilemessaging\smsmtm\multimode\group" mrp="app\messaging\mobilemessaging\smsmtm\multimode\group\messaging_sms_multimode.mrp"/>
      </component>
      <component name="audiomsg" long-name="Audio Message">
      </component>
@@ -5859,7 +5919,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="messaging" long-name="messaging">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/messaging/group"/>
+      <unit bldFile="app\messaging\group"/>
      </component>
     </collection>
    </block>
@@ -5895,7 +5955,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="conversations" long-name="conversations">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/conversations/group"/>
+      <unit bldFile="app\conversations\group"/>
      </component>
     </collection>
    </block>
@@ -5921,7 +5981,7 @@
      </component>
      <component name="utils" long-name="Utilities">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/utils/group"/>
+      <unit bldFile="app\utils\group"/>
      </component>
      <component name="wvotaparser" long-name="WV OTA Parser">
      </component>
@@ -5997,7 +6057,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="im" long-name="im">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/im/group"/>
+      <unit bldFile="app\im\group"/>
      </component>
     </collection>
    </block>
@@ -6025,7 +6085,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="dictionary" long-name="dictionary">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/dictionary/group"/>
+      <unit bldFile="app\dictionary\group"/>
      </component>
     </collection>
    </block>
@@ -6041,7 +6101,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="camera" long-name="camera">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/camera/group"/>
+      <unit bldFile="app\camera\group"/>
      </component>
     </collection>
    </block>
@@ -6081,7 +6141,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imgeditor" long-name="imgeditor">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/imgeditor/group"/>
+      <unit bldFile="app\imgeditor\group"/>
      </component>
     </collection>
    </block>
@@ -6121,7 +6181,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoeditor" long-name="videoeditor">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/videoeditor/group"/>
+      <unit bldFile="app\videoeditor\group"/>
      </component>
     </collection>
    </block>
@@ -6135,7 +6195,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="gallery" long-name="gallery">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/gallery/group"/>
+      <unit bldFile="app\gallery\group"/>
      </component>
     </collection>
    </block>
@@ -6169,7 +6229,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videoplayer" long-name="videoplayer">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/videoplayer/group"/>
+      <unit bldFile="app\videoplayer\group"/>
      </component>
     </collection>
    </block>
@@ -6267,7 +6327,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="photos" long-name="photos">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/photos/group"/>
+      <unit bldFile="app\photos\group"/>
      </component>
     </collection>
    </block>
@@ -6349,7 +6409,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="videocenter" long-name="videocenter">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/videocenter/group"/>
+      <unit bldFile="app\videocenter\group"/>
      </component>
     </collection>
    </block>
@@ -6419,7 +6479,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="musicplayer" long-name="musicplayer">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/musicplayer/group"/>
+      <unit bldFile="app\musicplayer\group"/>
      </component>
     </collection>
    </block>
@@ -6437,7 +6497,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="radio" long-name="radio">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/radio/group"/>
+      <unit bldFile="app\radio\group"/>
      </component>
     </collection>
    </block>
@@ -6459,7 +6519,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="voicerec" long-name="voicerec">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/voicerec/group"/>
+      <unit bldFile="app\voicerec\group"/>
      </component>
     </collection>
    </block>
@@ -6479,7 +6539,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="screensaver" long-name="screensaver">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/screensaver/group"/>
+      <unit bldFile="app\screensaver\group"/>
      </component>
     </collection>
    </block>
@@ -6507,7 +6567,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="homescreen" long-name="homescreen">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/homescreen/group"/>
+      <unit bldFile="app\homescreen\group"/>
      </component>
     </collection>
    </block>
@@ -6521,7 +6581,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="imgvieweruis" long-name="imgvieweruis">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/imgvieweruis/group"/>
+      <unit bldFile="app\imgvieweruis\group"/>
      </component>
     </collection>
    </block>
@@ -6535,7 +6595,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="graphicsuis" long-name="graphicsuis">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/graphicsuis/group"/>
+      <unit bldFile="app\graphicsuis\group"/>
      </component>
     </collection>
    </block>
@@ -6550,7 +6610,7 @@
     </collection>
     <collection name="symhelp" long-name="Symbian Help" level="eng">
      <component name="cshlpcmpbackend" long-name="CSHelp Compiler Backend">
-      <unit mrp="app/helps/symhelp/cshlpcmpbackend/group/tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
+      <unit mrp="app\helps\symhelp\cshlpcmpbackend\group\tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
      </component>
      <component name="cshlpcmpfrontend" long-name="CSHelp Compiler Frontend">
      </component>
@@ -6558,7 +6618,7 @@
      </component>
      <component name="helpmodel" long-name="Help" introduced="6.0">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <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>
      <component name="mbmcodec" long-name="MBM Codec" filter="gt">
      </component>
@@ -6568,7 +6628,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="helps" long-name="helps">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/helps/group"/>
+      <unit bldFile="app\helps\group"/>
      </component>
     </collection>
    </block>
@@ -6582,7 +6642,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="profile" long-name="profile">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/profile/group"/>
+      <unit bldFile="app\profile\group"/>
      </component>
     </collection>
    </block>
@@ -6646,7 +6706,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="speechsrv" long-name="speechsrv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/speechsrv/group"/>
+      <unit bldFile="app\speechsrv\group"/>
      </component>
     </collection>
    </block>
@@ -6690,7 +6750,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="webuis" long-name="webuis">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/webuis/group"/>
+      <unit bldFile="app\webuis\group"/>
      </component>
     </collection>
    </block>
@@ -6774,7 +6834,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="java" long-name="java">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/java/group"/>
+      <unit bldFile="app\java\group"/>
      </component>
     </collection>
    </block>
@@ -6822,7 +6882,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="rndtools" long-name="rndtools">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="tools/rndtools/group"/>
+      <unit bldFile="tools\rndtools\group"/>
      </component>
     </collection>
    </block>
@@ -6835,198 +6895,132 @@
     </collection>
     <collection name="controlpanel" long-name="Control Panel" level="ui">
      <component name="cctlcolscheme" long-name="Colour Scheme Control" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/controlpanel/cctlcolscheme/group" mrp="app/techview/controlpanel/cctlcolscheme/group/techview_cctlcolscheme.mrp"/>
      </component>
      <component name="fepsetup" long-name="FEP Setup" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/controlpanel/fepsetup/group" mrp="app/techview/controlpanel/fepsetup/group/techview_fepsetup.mrp"/>
      </component>
      <component name="keyclickref" long-name="Key Click Ref" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/controlpanel/keyclickref/Group" mrp="app/techview/controlpanel/keyclickref/Group/techview_KeyClickRef.mrp"/>
      </component>
      <component name="soundsetup" long-name="Sound Setup" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/controlpanel/soundsetup/group" mrp="app/techview/controlpanel/soundsetup/group/techview_soundsetup.mrp"/>
      </component>
     </collection>
     <collection name="datasyncapps" long-name="Data Sync Applications" level="apps2">
      <component name="syncmlapp" long-name="SyncML App" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/datasyncapps/syncmlapp/group" mrp="app/techview/datasyncapps/syncmlapp/group/techview_syncmlapp.mrp"/>
      </component>
     </collection>
     <collection name="installationapps" long-name="Installation Apps" level="apps2">
      <component name="installapp" long-name="Install App" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/installationapps/installapp/group" mrp="app/techview/installationapps/installapp/group/techview_installapp.mrp"/>
      </component>
     </collection>
     <collection name="messagingapps" long-name="Messaging Apps" level="apps2">
      <component name="messagingui" long-name="Messaging UI" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/messagingapps/messagingui/Group" mrp="app/techview/messagingapps/messagingui/Group/techview_messagingui.mrp"/>
      </component>
     </collection>
     <collection name="networkingapps" long-name="Networking Apps" level="apps1">
      <component name="iapstatusapp" long-name="IAP Status App" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/networkingapps/iapstatusapp/group" mrp="app/techview/networkingapps/iapstatusapp/group/techview_iapstatusapp.mrp"/>
      </component>
      <component name="networkingagentnotifier" long-name="Networking Agent Notifier" filter="techview" plugin="Y" introduced="7.0s">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/networkingapps/networkingagentnotifier/group" mrp="app/techview/networkingapps/networkingagentnotifier/group/techview_networking_agentnotifier.mrp"/>
      </component>
      <component name="techviewvpnui" long-name="VPN UI" filter="techview" introduced="7.0">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/networkingapps/techviewvpnui/group" mrp="app/techview/networkingapps/techviewvpnui/group/techview_networking_vpnui.mrp"/>
      </component>
     </collection>
     <collection name="networkingutils" long-name="Networking Utils" level="utils">
      <component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0">
-      <unit mrp="app/techview/networkingutils/ipadministrationtool/group/networking_ipadm.mrp"/>
+      <unit mrp="app\techview\networkingutils\ipadministrationtool\group\networking_ipadm.mrp"/>
      </component>
      <component name="nameresolverutility" long-name="Name Resolver Utility" introduced="7.0s">
-      <unit mrp="app/techview/networkingutils/nameresolverutility/group/networking_nslookup.mrp"/>
+      <unit mrp="app\techview\networkingutils\nameresolverutility\group\networking_nslookup.mrp"/>
      </component>
     </collection>
     <collection name="pimapps" long-name="PIM Apps" level="apps3">
      <component name="agenda" long-name="Agenda UI" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/pimapps/agenda/group" mrp="app/techview/pimapps/agenda/group/techview_agenda.mrp"/>
      </component>
      <component name="contactstechview" long-name="Contacts" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/pimapps/contactstechview/group" mrp="app/techview/pimapps/contactstechview/group/techview_contacts.mrp"/>
      </component>
      <component name="contacui" long-name="Contacts UI" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/pimapps/contacui/group" mrp="app/techview/pimapps/contacui/group/techview_contacui.mrp" priority="30"/>
      </component>
     </collection>
     <collection name="securityapps" long-name="Security Apps" level="apps3">
      <component name="secui" long-name="Security UI" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/securityapps/secui/group" mrp="app/techview/securityapps/secui/group/techview_secui.mrp"/>
      </component>
      <component name="securityupstechview" long-name="Security UPS Techview" filter="techview">
      </component>
     </collection>
     <collection name="shortlinkapps" long-name="Shortlink Apps" level="apps1">
      <component name="bluetoothui" long-name="Bluetooth UI" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/shortlinkapps/bluetoothui/group" mrp="app/techview/shortlinkapps/bluetoothui/group/techview_bluetoothui.mrp"/>
      </component>
      <component name="connectui" long-name="Connect UI" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/shortlinkapps/connectui/group" mrp="app/techview/shortlinkapps/connectui/group/techview_connectui.mrp"/>
      </component>
      <component name="techviewusbui" long-name="USB UI" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/shortlinkapps/techviewusbui/group" mrp="app/techview/shortlinkapps/techviewusbui/group/techview_usbui.mrp"/>
      </component>
     </collection>
     <collection name="techviewplat" long-name="Techview Platform" level="services">
      <component name="eikstd" long-name="EIKSTD" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/techviewplat/eikstd/group" mrp="app/techview/techviewplat/eikstd/group/techview_eikstd.mrp" priority="20"/>
      </component>
      <component name="feps" long-name="FEPS" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/techviewplat/feps/group" mrp="app/techview/techviewplat/feps/group/techview_feps.mrp"/>
      </component>
      <component name="techviewuiklaf" long-name="UIKLAF" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/techviewplat/techviewuiklaf/GROUP" mrp="app/techview/techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
      </component>
     </collection>
     <collection name="techviewui" long-name="Techview UI" level="ui">
      <component name="techviewextras" long-name="Extras" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/techviewui/techviewextras/group" mrp="app/techview/techviewui/techviewextras/group/techview_extras.mrp"/>
      </component>
      <component name="shell" long-name="Shell" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/techviewui/shell/group" mrp="app/techview/techviewui/shell/group/techview_shell.mrp"/>
      </component>
      <component name="startup" long-name="Startup" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/techviewui/startup/group" mrp="app/techview/techviewui/startup/group/techview_startup.mrp"/>
      </component>
      <component name="statuspane" long-name="Status Pane" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/techviewui/statuspane/group" mrp="app/techview/techviewui/statuspane/group/techview_statuspane.mrp"/>
      </component>
     </collection>
     <collection name="telephonyapps" long-name="Telephony Apps" level="apps1">
      <component name="techviewphoneui" long-name="Phone UI" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/telephonyapps/techviewphoneui/group" mrp="app/techview/telephonyapps/techviewphoneui/group/techview_phoneui.mrp"/>
      </component>
     </collection>
     <collection name="testapps" long-name="Test Apps" level="utils">
      <component name="rschandler" long-name="Resource Handler" deprecated="tb92">
-      <unit mrp="app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp"/>
+      <unit mrp="app\techview\testapps\rschandler\tvresourcehandler\group\Testtools_ResourceHandler_gt.mrp"/>
      </component>
      <component name="rschandlerui" long-name="Resource Handler UI" filter="techview">
      </component>
      <component name="statdevice" long-name="STAT Device" filter="techview">
      </component>
      <component name="simpleapp" long-name="Simple App" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/testapps/simpleapp/group" mrp="app/techview/testapps/simpleapp/group/Techview_SimpleApp.mrp"/>
      </component>
      <component name="memspy" long-name="MemSpy" filter="techview" introduced="9.2" class="test" purpose="development" license-values="3">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-              <unit bldFile="app/techview/testapps/memspy/group" mrp="app/techview/testapps/memspy/group/graphics_memspy.mrp"/>
      </component>
     </collection>
     <collection name="toolkit" long-name="Toolkit" level="utils">
      <component name="additionalconfigfiles" long-name="Additional Configuration Files" filter="techview">
-      <unit mrp="app/techview/toolkit/configfiles/techview_additional_cedar.mrp"/>
+      <unit mrp="app\techview\toolkit\configfiles\techview_additional_cedar.mrp"/>
      </component>
      <component name="configfiles" long-name="Configuration Files" filter="techview">
-      <unit mrp="app/techview/toolkit/configfiles/techview_epoc_ini.mrp"/>
+      <unit mrp="app\techview\toolkit\configfiles\techview_epoc_ini.mrp"/>
      </component>
      <component name="romimages" long-name="ROM Images" filter="techview">
-      <unit version="9.4" mrp="os/deviceplatformrelease/symbianosbld/cedarutils/techview_roms_9.4.mrp"/>
+      <unit version="9.4" mrp="os\deviceplatformrelease\symbianosbld\cedarutils\techview_roms_9.4.mrp"/>
      </component>
      <component name="romkit" long-name="ROM Kit" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/toolkit/romkit/group" mrp="app/techview/toolkit/romkit/group/techview_romkit.mrp"/>
      </component>
     </collection>
     <collection name="utilityapps" long-name="Utility Apps" level="apps2">
      <component name="helptechview" long-name="Help" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/utilityapps/helptechview/group" mrp="app/techview/utilityapps/helptechview/group/techview_help.mrp"/>
      </component>
      <component name="timew" long-name="World Time" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/utilityapps/timew/group" mrp="app/techview/utilityapps/timew/group/techview_timew.mrp"/>
-     </component>
-    </collection>
-    <collection name="avapps" long-name="A/V Apps" level="apps3">
+     </component>
+    </collection>
+    <collection name="avapps" long-name="a\v Apps" level="apps3">
      <component name="techviewaudio" long-name="Audio" filter="techview">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/avapps/techviewaudio/Group" mrp="app/techview/avapps/techviewaudio/Group/techview_audio.mrp"/>
      </component>
     </collection>
     <collection name="buildverification" long-name="Build Verification" level="services">
      <component name="smoketest" long-name="Smoke Test" filter="gt">
       <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/buildverification/smoketest/Group" mrp="app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
+            <unit bldFile="app\techview\buildverification\smoketest\Group" mrp="app\techview\buildverification\smoketest\group\testtools_smoketest.mrp"/>
      </component>
     </collection>
     <collection name="sysvalidation" long-name="System Validation" level="services">
      <component name="systemtestos" long-name="System Test OS" filter="systemtest">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/sysvalidation/systemtestos/Group" mrp="app/techview/sysvalidation/systemtestos/Group/systemtest_os.mrp"/>
      </component>
      <component name="systemtesttools" long-name="System Test Tools" filter="systemtest">
-      <!-- Unit added by SF via autopopulating script from System Definition Template -->
-            <unit bldFile="app/techview/sysvalidation/systemtesttools/Group" mrp="app/techview/sysvalidation/systemtesttools/Group/systemtest_tools.mrp"/>
      </component>
     </collection>
    </block>
@@ -7037,7 +7031,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="audiostubs" long-name="audiostubs">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/audiostubs/group"/>
+      <unit bldFile="adaptation\stubs\audiostubs\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7045,7 +7039,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="btaudioadaptation_stub" long-name="btaudioadaptation_stub">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
+      <unit bldFile="adaptation\stubs\btaudioadaptation_stub\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7053,7 +7047,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="drm_stubs" long-name="drm_stubs">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/drm_stubs/group"/>
+      <unit bldFile="adaptation\stubs\drm_stubs\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7061,7 +7055,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="licensee_tsy_stub" long-name="licensee_tsy_stub">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/licensee_tsy_stub/group"/>
+      <unit bldFile="adaptation\stubs\licensee_tsy_stub\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7069,7 +7063,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="ocrsrv_stub" long-name="ocrsrv_stub">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+      <unit bldFile="adaptation\stubs\ocrsrv_stub\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7077,7 +7071,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="omasuplasnconverterstubimpl" long-name="omasuplasnconverterstubimpl">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+      <unit bldFile="adaptation\stubs\omasuplasnconverterstubimpl\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7085,7 +7079,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="posmsgpluginreferenceimpl" long-name="posmsgpluginreferenceimpl">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+      <unit bldFile="adaptation\stubs\posmsgpluginreferenceimpl\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7093,7 +7087,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="power_save_display_mode_stub" long-name="power_save_display_mode_stub">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+      <unit bldFile="adaptation\stubs\power_save_display_mode_stub\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7101,7 +7095,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="simatk_tsy_stub" long-name="simatk_tsy_stub">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/simatk_tsy_stub/group"/>
+      <unit bldFile="adaptation\stubs\simatk_tsy_stub\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7109,7 +7103,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="srsfenginestub" long-name="srsfenginestub">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+      <unit bldFile="adaptation\stubs\srsfenginestub\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7117,7 +7111,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="systemswstubs" long-name="systemswstubs">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/systemswstubs/group"/>
+      <unit bldFile="adaptation\stubs\systemswstubs\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7125,7 +7119,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="tactileclickplugin_stub" long-name="tactileclickplugin_stub">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+      <unit bldFile="adaptation\stubs\tactileclickplugin_stub\group"/>
      </component>
     </collection>
     <!-- Following Collection added by SF via autopopulating script from S60 Model -->
@@ -7133,7 +7127,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="wlanhwinit_stub" long-name="wlanhwinit_stub">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+      <unit bldFile="adaptation\stubs\wlanhwinit_stub\group"/>
      </component>
     </collection>
    </block>
@@ -7144,7 +7138,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="commonemail" long-name="commonemail">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/commonemail/group"/>
+      <unit bldFile="app\commonemail\group"/>
      </component>
     </collection>
    </block>
@@ -7155,7 +7149,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="printing" long-name="printing">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="app/printing/group"/>
+      <unit bldFile="app\printing\group"/>
      </component>
     </collection>
    </block>
@@ -7166,7 +7160,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="hapticsservices" long-name="hapticsservices">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/hapticsservices/group"/>
+      <unit bldFile="mw\hapticsservices\group"/>
      </component>
     </collection>
    </block>
@@ -7177,7 +7171,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="mobiletv" long-name="mobiletv">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="mw/mobiletv/group"/>
+      <unit bldFile="mw\mobiletv\group"/>
      </component>
     </collection>
    </block>
@@ -7188,7 +7182,7 @@
      <!-- Following Component added by SF via autopopulating script from S60 Model -->
      <component name="buildplatforms" long-name="buildplatforms">
       <!-- Unit added by SF via autopopulating script from S60 Model -->
-      <unit bldFile="tools/buildplatforms/group"/>
+      <unit bldFile="tools\buildplatforms\group"/>
      </component>
     </collection>
    </block>