# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1241719082 -3600
# Node ID 87f2aa5772549c9033e4424e1007df5d93bc8c2b
# Parent  aabc3db64314f44dcfb9764bba88fef8ae93da7f
Add week 18 system models for sos and s60

diff -r aabc3db64314 -r 87f2aa577254 ex-nokia/sysdefs/system_model_os.xml
--- a/ex-nokia/sysdefs/system_model_os.xml	Thu May 07 15:01:22 2009 +0100
+++ b/ex-nokia/sysdefs/system_model_os.xml	Thu May 07 18:58:02 2009 +0100
@@ -92,450 +92,421 @@
     <layer name="Tools and Utils and SDKENG" levels="SDK tools test">
       <collection name="Build System Tools" level="tools">
         <component name="BUILDSYSTEMTOOLS">
-          <unit bldFile="sf\os\buildtools\bldsystemtools\buildsystemtools\group" mrp="sf\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="GT Techview Baseline">
-          <unit mrp="sf\os\buildtools\bldsystemtools\gttechviewbaseline\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
-		     <package name="gt_only_baseline" mrp="sf\os/buildtools/bldsystemtools/gttechviewbaseline/gt_only_baseline.mrp"/> -->
+		     <package name="gt_only_baseline" mrp="os/buildtools/packaging/additionalutils/gt_only_baseline.mrp"/> -->
         </component>
         <component name="Cedar Utils">
-          <unit mrp="sf\os\buildtools\bldsystemtools\cedarutils\tools_utils_cedar.mrp"/>
+          <unit mrp="os\deviceplatformrelease\symbianosbld\cedarutils\tools_utils_cedar.mrp"/>
         </component>
         <component name="Common Utils">
-          <unit mrp="sf\os\buildtools\bldsystemtools\commonbldutils\tools_utils_common.mrp"/>
+          <unit mrp="os\buildtools\bldsystemtools\commonbldutils\tools_utils_common.mrp"/>
         </component>
         <component name="Additional Utils">
-          <unit mrp="sf\os\buildtools\bldsystemtools\gttechviewbaseline\additional_unknown_cedar.mrp"/>
+          <unit mrp="os\buildtools\packaging\additionalutils\additional_unknown_cedar.mrp"/>
         </component>
       </collection>
       <collection name="Tools and Utils" level="tools">
         <component name="CTS Functionality Checkers">
-          <unit mrp="sf\os\buildtools\toolsandutils\ctsfunctionalitycheckers\Group\testtools_cts_functionalitycheckers.mrp"/>
+          <unit mrp="os\buildtools\toolsandutils\ctsfunctionalitycheckers\Group\testtools_cts_functionalitycheckers.mrp"/>
         </component>
         <component name="BURTESTSERVER">
-          <unit bldFile="sf\os\buildtools\toolsandutils\burtestserver\Group" mrp="sf\os\buildtools\toolsandutils\burtestserver\Group\testtools_burtestserver.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\burtestserver\Group" mrp="os\buildtools\toolsandutils\burtestserver\Group\testtools_burtestserver.mrp"/>
         </component>
         <component name="CBRTOOLS" filter="gt">
-          <unit bldFile="sf\os\buildtools\toolsandutils\cbrtools\group" mrp="sf\os\buildtools\toolsandutils\cbrtools\group\tools_cbr_tools.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\cbrtools\group" mrp="os\buildtools\toolsandutils\cbrtools\group\tools_cbr_tools.mrp"/>
         </component>
         <component name="CBRPRF">
-          <unit bldFile="sf\os\buildtools\toolsandutils\prf\group" mrp="sf\os\buildtools\toolsandutils\prf\group\tools_cbr_prf.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\prf\group" mrp="os\buildtools\toolsandutils\prf\group\tools_cbr_prf.mrp"/>
         </component>
         <component name="CDB">
-          <unit bldFile="sf\os\buildtools\toolsandutils\cdb\group" mrp="sf\os\buildtools\toolsandutils\cdb\group\testtools_cdb.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\cdb\group" mrp="os\buildtools\toolsandutils\cdb\group\testtools_cdb.mrp"/>
         </component>
         <component name="CHATSCRIPTS">
-          <unit bldFile="sf\mw\remoteconn\connectivitypcside\chatscripts\group" mrp="sf\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="DEPCHECK">
-          <unit bldFile="sf\os\buildtools\toolsandutils\depcheck" mrp="sf\os\buildtools\toolsandutils\depcheck\tools_depcheck.mrp"/>
-        </component>
-        <component name="Dependency Modeller" introduced="9.2" class="test PC">
-          <unit bldFile="sf\os\buildtools\toolsandutils\dependencymodeller\group" mrp="sf\os\buildtools\toolsandutils\dependencymodeller\tools_depmodel.mrp"/>
+          <unit bldFile="os\buildtools\binanamdw_os\depcheck" mrp="os\buildtools\binanamdw_os\depcheck\tools_depcheck.mrp"/>
         </component>
         <component name="E32 Tools" class="PC">
-          <unit bldFile="sf\os\buildtools\toolsandutils\e32tools\group" mrp="sf\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="E32 Perl Tools" class="PC">
-          <unit mrp="sf\os\buildtools\toolsandutils\e32toolp\group\tools_e32toolp.mrp"/>
+          <unit mrp="os\buildtools\sbsv1_os\e32toolp\group\tools_e32toolp.mrp"/>
         </component>
         <component name="EVALID">
-          <unit bldFile="sf\os\buildtools\toolsandutils\evalid" mrp="sf\os\buildtools\toolsandutils\evalid\tools_evalid.mrp"/>
+          <unit bldFile="os\buildtools\bintools_os\evalid" mrp="os\buildtools\bintools_os\evalid\tools_evalid.mrp"/>
         </component>
         <component name="KITCOMPARATOR">
-          <unit bldFile="sf\os\buildtools\toolsandutils\kitcomparator\group" mrp="sf\os\buildtools\toolsandutils\kitcomparator\group\testtools_cts_kitcomparator.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\kitcomparator\group" mrp="os\buildtools\toolsandutils\kitcomparator\group\testtools_cts_kitcomparator.mrp"/>
         </component>
         <component name="LEAVESCAN">
-          <unit bldFile="sf\os\buildtools\toolsandutils\leavescan\group" mrp="sf\os\buildtools\toolsandutils\leavescan\group\testtools_leavescan.mrp"/>
+          <unit bldFile="os\buildtools\srcanamdw_os\leavescan\group" mrp="os\buildtools\srcanamdw_os\leavescan\group\testtools_leavescan.mrp"/>
         </component>
         <component name="PROGRAMCHECKER">
-          <unit bldFile="sf\os\buildtools\toolsandutils\programchecker\group" mrp="sf\os\buildtools\toolsandutils\programchecker\group\testtools_programchecker.mrp"/>
+          <unit bldFile="os\buildtools\srcanamdw_os\programchecker\group" mrp="os\buildtools\srcanamdw_os\programchecker\group\testtools_programchecker.mrp"/>
         </component>
         <component name="RCOMP">
-          <unit bldFile="sf\os\buildtools\toolsandutils\rcomp\group" mrp="sf\os\buildtools\toolsandutils\rcomp\group\tools_rcomp.mrp"/>
+          <unit bldFile="os\buildtools\bintools_os\rcomp\group" mrp="os\buildtools\bintools_os\rcomp\group\tools_rcomp.mrp"/>
         </component>
         <component name="Redistribution" filter="gt">
-          <unit bldFile="sf\os\buildtools\toolsandutils\redistribution" mrp="sf\os\buildtools\toolsandutils\redistribution\tools_redistribution_common.mrp"/>
+          <unit bldFile="os\buildtools\perltoolsplat_os\redistribution" mrp="os\buildtools\perltoolsplat_os\redistribution\tools_redistribution_common.mrp"/>
         </component>
         <component name="WinC Redistribution">
-          <unit mrp="sf\os\buildtools\toolsandutils\wincredistribution\tools_redistribution_winc.mrp"/>
+          <unit mrp="os\buildtools\dist_os\redistributionwinceka2\tools_redistribution_winc.mrp"/>
         </component>
         <component name="Additional Redistribution">
-          <unit mrp="sf\os\buildtools\toolsandutils\redistribution\additional_tools.mrp"/>
+          <unit mrp="os\buildtools\perltoolsplat_os\redistribution\additional_tools.mrp"/>
         </component>
         <component name="RESOURCE_HANDLER" contract="Symbian_Affiliate">
-          <unit mrp="sf\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="ROMKIT_EKA2">
-          <unit bldFile="sf\os\buildtools\toolsandutils\romkiteka2\group" mrp="sf\os\buildtools\toolsandutils\romkiteka2\group\tools_romkit.mrp"/>
+          <unit bldFile="os\buildtools\imgtools_os\romkiteka2\group" mrp="os\buildtools\imgtools_os\romkiteka2\group\tools_romkit.mrp"/>
         </component>
         <component name="MIGRATIONTOOL">
-          <unit bldFile="sf\os\buildtools\toolsandutils\migrationtool\group" mrp="sf\os\buildtools\toolsandutils\migrationtool\group\testtools_migrationtool.mrp"/>
+          <unit bldFile="os\buildtools\srcanamdw_os\migrationtool\group" mrp="os\buildtools\srcanamdw_os\migrationtool\group\testtools_migrationtool.mrp"/>
         </component>
         <component name="TESTDRIVER">
-          <unit bldFile="sf\os\buildtools\toolsandutils\testdriver\Group" mrp="sf\os\buildtools\toolsandutils\testdriver\Group\testtools_testdriver.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\testdriver\Group" mrp="os\buildtools\toolsandutils\testdriver\Group\testtools_testdriver.mrp"/>
         </component>
         <component name="S60 Compatibility Headers" filter="gt">
-          <unit version="9.4" bldFile="sf\os\ossrv\genericservices\s60compatibilityheaders\group94" mrp="sf\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="SMOKETEST" filter="gt">
-          <unit bldFile="sf\app\techview\buildverification\smoketest\Group" mrp="sf\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>
         <component name="Stat API" filter="gt">
-          <unit bldFile="sf\os\buildtools\toolsandutils\statapi\source\statapi\console" mrp="sf\os\buildtools\toolsandutils\statapi\group\testtools_stat_device_gt.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\statapi\source\statapi\console" mrp="os\buildtools\toolsandutils\statapi\group\testtools_stat_device_gt.mrp"/>
         </component>
         <component name="Stat Source" contract="Symbian_Affiliate" filter="gt">
-          <unit mrp="sf\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="STAT_DESKTOP" contract="Symbian_Affiliate" filter="gt">
-          <unit bldFile="sf\os\buildtools\toolsandutils\statdesktop\group" mrp="sf\os\buildtools\toolsandutils\statdesktop\group\testtools_stat_desktop.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\statdesktop\group" mrp="os\buildtools\toolsandutils\statdesktop\group\testtools_stat_desktop.mrp"/>
         </component>
         <component name="Bluetooth Logging Engine" introduced="9.2" class="test">
-          <unit bldFile="sf\os\shortlinksrv\bluetooth\btlogger\group" mrp="sf\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="TESTEXECUTE">
-          <unit bldFile="sf\os\buildtools\toolsandutils\testexecute\Group" mrp="sf\os\buildtools\toolsandutils\testexecute\Group\tools_testexecute.mrp"/>
+          <unit bldFile="os\osrndtools\testexecfw1\testexecute\Group" mrp="os\osrndtools\testexecfw1\testexecute\Group\tools_testexecute.mrp"/>
         </component>
         <component name="Test Tools Desktop" filter="gt">
-          <unit bldFile="sf\os\buildtools\toolsandutils\testtoolsdesktop\group" mrp="sf\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="Wintunnel">
-          <unit mrp="sf\os\buildtools\toolsandutils\wintunnel\group\testtools_WinTunnel_srconly.mrp"/>
+          <unit mrp="os\buildtools\toolsandutils\wintunnel\group\testtools_WinTunnel_srconly.mrp"/>
         </component>
         <component name="Use Case Controller">
-          <unit bldFile="sf\os\buildtools\toolsandutils\usecasecontroller\BuildScripts\group" mrp="sf\os\buildtools\toolsandutils\usecasecontroller\BuildScripts\group\testtools_ucc.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\usecasecontroller\BuildScripts\group" mrp="os\buildtools\toolsandutils\usecasecontroller\BuildScripts\group\testtools_ucc.mrp"/>
         </component>
         <component name="CINIDATA">
-          <unit bldFile="sf\os\buildtools\toolsandutils\cinidata" mrp="sf\os\buildtools\toolsandutils\cinidata\tools_cinidata.mrp"/>
+          <unit bldFile="os\osrndtools\testexecfw1\cinidata" mrp="os\osrndtools\testexecfw1\cinidata\tools_cinidata.mrp"/>
         </component>
         <component name="AUTOTEST">
-          <unit bldFile="sf\os\buildtools\toolsandutils\autotest\group" mrp="sf\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="TESTCONFIGFILEPARSER">
-          <unit bldFile="sf\os\buildtools\toolsandutils\testconfigfileparser\group" mrp="sf\os\buildtools\toolsandutils\testconfigfileparser\group\tools_testconfigfileparser.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\testconfigfileparser\group" mrp="os\buildtools\toolsandutils\testconfigfileparser\group\tools_testconfigfileparser.mrp"/>
         </component>
         <component name="KITSETUPAPP" filter="gt">
-          <unit mrp="sf\os\buildtools\toolsandutils\kitsetupapp\group\tools_devkits_kitsetupapp.mrp"/>
+          <unit mrp="os\buildtools\toolsandutils\kitsetupapp\group\tools_devkits_kitsetupapp.mrp"/>
         </component>
         <component name="NAVIGATION_PAGES">
-          <unit mrp="sf\os\buildtools\toolsandutils\navigationpages\tools_sdk_eng_NavigationPages.mrp"/>
+          <unit mrp="os\buildtools\toolsandutils\navigationpages\tools_sdk_eng_NavigationPages.mrp"/>
         </component>
         <component name="PRODUCTINSTALLER" filter="gt">
-          <unit bldFile="sf\os\buildtools\toolsandutils\productinstaller\group" mrp="sf\os\buildtools\toolsandutils\productinstaller\group\tools_custkits_productinstaller.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\productinstaller\group" mrp="os\buildtools\toolsandutils\productinstaller\group\tools_custkits_productinstaller.mrp"/>
         </component>
         <component name="REDISTRIBUTION_WINC_EKA2">
-          <unit bldFile="sf\os\buildtools\toolsandutils\wincredistribution" mrp="sf\os\buildtools\toolsandutils\wincredistribution\tools_redistribution_cedar.mrp"/>
+          <unit bldFile="os\buildtools\dist_os\redistributionwinceka2" mrp="os\buildtools\dist_os\redistributionwinceka2\tools_redistribution_cedar.mrp"/>
         </component>
         <component name="MakeKeys" filter="gt" introduced="6.0" class="PC">
-          <unit bldFile="sf\os\misc\secureswitools\makekeys\group" mrp="sf\os\misc\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="CAPTOOLS">
-          <unit bldFile="sf\os\buildtools\toolsandutils\captools\group" mrp="sf\os\buildtools\toolsandutils\captools\group\testtools_captools.mrp"/>
+          <unit bldFile="os\buildtools\binanamdw_os\captools\group" mrp="os\buildtools\binanamdw_os\captools\group\testtools_captools.mrp"/>
         </component>
         <component name="Packet Loopback CSY" introduced="8.1" class="test">
-          <unit bldFile="sf\os\commsfw\serialcommsserverplugins\packetloopbackcsy\group" mrp="sf\os\commsfw\serialcommsserverplugins\packetloopbackcsy\group\PacketLoopbackCSY.mrp"/>
+          <unit bldFile="os\commsfw\serialserver\packetloopbackcsy\group" mrp="os\commsfw\serialserver\packetloopbackcsy\group\PacketLoopbackCSY.mrp"/>
         </component>
         <component name="UTRACE" introduced="9.3" deprecated="9.4">
-          <unit bldFile="sf\os\persistentdata\traceservices\utrace\group" mrp="sf\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>
         <component name="STLPORT">
-          <unit bldFile="sf\os\buildtools\toolsandutils\stlport\group" mrp="sf\os\buildtools\toolsandutils\stlport\group\tools_stlport.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\stlport\group" mrp="os\buildtools\toolsandutils\stlport\group\tools_stlport.mrp"/>
         </component>
       </collection>
       <collection name="Developer Library" level="test">
         <component name="Developer Library Tools" class="placeholder">
-          <!-- placeholder for  mrp="sf\os/buildtools/devlib/devlibhelp/tools/developerlibrary_tools.mrp" -->
+          <!-- placeholder for  mrp="os/buildtools/devlib/devlibhelp/tools/developerlibrary_tools.mrp" -->
         </component>
         <component name="Developer Library Help">
-          <unit version="9.4" bldFile="sf\os\buildtools\devlib\devlibhelp\group\devlib94" mrp="sf\os\buildtools\devlib\devlibhelp\group\devlib94\developerlibrary_doc_html.mrp"/>
+          <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="Developer Library Source" filter="gt">
-          <unit bldFile="sf\os\buildtools\devlib\devlibhelp\securitysupplement\doc_source" mrp="sf\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="Developer Library HTML">
-          <unit mrp="sf\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>
         <!-- lots of subsystem documentation packages -->
         <component name="Application Engines Documentation" class="doc">
-          <unit mrp="sf\app\organizer\pimappservices\appenginesdocs\app-engines_documentation.mrp"/>
+          <unit mrp="app\organizer\pimappservices\appenginesdocs\app-engines_documentation.mrp"/>
         </component>
         <component name="UI Frameworks Documentation" class="doc">
-          <unit mrp="sf\mw\classicui\commonuisupport\uifwsdocs\app-framework_documentation.mrp"/>
+          <unit mrp="mw\classicui\commonuisupport\uifwsdocs\app-framework_documentation.mrp"/>
         </component>
         <component name="Application Services Documentation" class="doc">
-          <unit mrp="sf\mw\appsupport\commonappservices\appservicesdocs\app-services_documentation.mrp"/>
+          <unit mrp="mw\appsupport\commonappservices\appservicesdocs\app-services_documentation.mrp"/>
         </component>
         <component name="Base Documentation">
-          <unit mrp="sf\os\kernelhwsrv\userlibandfileserver\basedocs\base_documentation.mrp"/>
+          <unit mrp="os\kernelhwsrv\userlibandfileserver\basedocs\base_documentation.mrp"/>
         </component>
         <component name="Bluetooth Documentation" class="doc">
-          <unit mrp="sf\os\shortlinksrv\bluetooth\btdocs\bluetooth_documentation.mrp"/>
-        </component>
-        <component name="IrDA Documentation" class="doc">
-          <unit mrp="sf\os\shortlinksrv\irda\irdadocs\infra-red_documentation.mrp"/>
+          <unit mrp="os\shortlinksrv\bluetooth\btdocs\bluetooth_documentation.mrp"/>
         </component>
         <component name="Comms Infrastructure Documentation" introduced="7.0" class="doc">
-          <unit mrp="sf\os\commsfw\commsfwutils\commsinfrastructuredocs\comms-infras_documentation.mrp"/>
+          <unit mrp="os\commsfw\commsfw_info\commsinfrastructuredocs\comms-infras_documentation.mrp"/>
         </component>
         <component name="Graphics Documentation" contract="Symbian_Affiliate" class="doc">
-          <unit mrp="sf\os\graphics\graphicstest\graphicsdocs\graphics_documentation.mrp"/>
+          <unit mrp="os\graphics\graphics_info\graphicsdocs\graphics_documentation.mrp"/>
         </component>
         <component name="Multimedia Documentation">
-          <unit mrp="sf\os\mm\imagingandcamerafws\mmdocs\multimedia_documentation.mrp"/>
+          <unit mrp="os\mm\mm_info\mmdocs\multimedia_documentation.mrp"/>
         </component>
         <component name="Networking Documentation" class="doc">
-          <unit mrp="sf\os\networkingsrv\networkingtestandutils\networkingdocs\networking_documentation.mrp"/>
+          <unit mrp="os\networkingsrv\networkingsrv_info\networkingdocs\networking_documentation.mrp"/>
         </component>
         <component name="Security Documentation">
-          <unit mrp="sf\os\security\cryptomgmtlibs\securitydocs\security_documentation.mrp"/>
+          <unit mrp="os\security\cryptomgmtlibs\securitydocs\security_documentation.mrp"/>
         </component>
         <component name="Shortlink Documentation">
-          <unit mrp="sf\os\commsfw\serialserver\c32serialserverdocs\ser-comms_documentation.mrp"/>
+          <unit mrp="os\commsfw\serialserver\c32serialserverdocs\ser-comms_documentation.mrp"/>
         </component>
         <component name="Syslibs Documentation" class="doc">
-          <unit mrp="sf\os\ossrv\genericservices\syslibsdocs\syslibs_documentation.mrp"/>
+          <unit mrp="os\ossrv\genericservices\syslibsdocs\syslibs_documentation.mrp"/>
         </component>
         <component name="System Documentation" class="doc">
-          <unit mrp="sf\os\buildtools\devlib\systemdocs\group\system.mrp"/>
+          <unit mrp="os\deviceplatformrelease\foundation_system\systemdocs\group\system.mrp"/>
         </component>
         <component name="Telephony Confidential Documentation" class="doc">
-          <unit mrp="sf\os\cellularsrv\telephonyutils\telephonyconfidentialdocs\telephony_confidential.mrp"/>
+          <unit mrp="os\cellularsrv\cellularsrv_info\telephonyconfidentialdocs\telephony_confidential.mrp"/>
         </component>
         <component name="Telephony Documentation" class="doc">
-          <unit mrp="sf\os\cellularsrv\telephonyutils\telephonydocs\telephony_documentation.mrp"/>
+          <unit mrp="os\cellularsrv\cellularsrv_info\telephonydocs\telephony_documentation.mrp"/>
         </component>
         <component name="Tools Documentation">
-          <unit mrp="sf\os\buildtools\devlib\toolsdocs\tools_documentation.mrp"/>
+          <unit mrp="os\buildtools\devlib\toolsdocs\tools_documentation.mrp"/>
         </component>
         <component name="USB Class and Manager Documentation" class="doc">
-          <unit mrp="sf\os\shortlinksrv\usbmgmt\usbclassandmgrdocs\usb_documentation.mrp"/>
+          <unit mrp="os\shortlinksrv\usbmgmt\usbclassandmgrdocs\usb_documentation.mrp"/>
         </component>
       </collection>
       <collection name="SDKENG" level="SDK">
         <component name="RUNPERL" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\runperl\group" mrp="sf\os\buildtools\misccomponents\runperl\group\tools_sdk_eng_runperl.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\runperl\group" mrp="os\buildtools\misccomponents\runperl\group\tools_sdk_eng_runperl.mrp"/>
         </component>
         <component name="BUILD-TOOLS" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\bldtools\group" mrp="sf\os\buildtools\misccomponents\bldtools\group\tools_sdk_eng_build-tools.mrp"/>
+          <unit bldFile="os\buildtools\sbsv1_os\bldtools\group" mrp="os\buildtools\sbsv1_os\bldtools\group\tools_sdk_eng_build-tools.mrp"/>
         </component>
         <component name="JAVALIBRARY" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\javalib\group" mrp="sf\os\buildtools\misccomponents\javalib\group\tools_sdk_eng_javalibrary.mrp"/>
+          <unit bldFile="os\buildtools\javatoolsplat\javalib\group" mrp="os\buildtools\javatoolsplat\javalib\group\tools_sdk_eng_javalibrary.mrp"/>
         </component>
         <component name="ASSERTION" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\assertion\group" mrp="sf\os\buildtools\misccomponents\assertion\group\tools_sdk_eng_assertion.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\assertion\group" mrp="os\buildtools\misccomponents\assertion\group\tools_sdk_eng_assertion.mrp"/>
         </component>
         <component name="ENUM" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\enum\group" mrp="sf\os\buildtools\misccomponents\enum\group\tools_sdk_eng_enum.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\enum\group" mrp="os\buildtools\misccomponents\enum\group\tools_sdk_eng_enum.mrp"/>
         </component>
         <component name="LOGGER" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\logger\group" mrp="sf\os\buildtools\misccomponents\logger\group\tools_sdk_eng_logger.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\logger\group" mrp="os\buildtools\misccomponents\logger\group\tools_sdk_eng_logger.mrp"/>
         </component>
         <component name="FILESYS" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\filesys\group" mrp="sf\os\buildtools\misccomponents\filesys\group\tools_sdk_eng_filesys.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\filesys\group" mrp="os\buildtools\misccomponents\filesys\group\tools_sdk_eng_filesys.mrp"/>
         </component>
         <component name="ENVVAR" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\envvar\group" mrp="sf\os\buildtools\misccomponents\envvar\group\tools_sdk_eng_envvar.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\envvar\group" mrp="os\buildtools\misccomponents\envvar\group\tools_sdk_eng_envvar.mrp"/>
         </component>
         <component name="INSTALLUTILS" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\installutils\group" mrp="sf\os\buildtools\misccomponents\installutils\group\tools_sdk_eng_installutils.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\installutils\group" mrp="os\buildtools\misccomponents\installutils\group\tools_sdk_eng_installutils.mrp"/>
         </component>
         <component name="MNEMONICFIX" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\mnemonicfix\group" mrp="sf\os\buildtools\misccomponents\mnemonicfix\group\tools_sdk_eng_mnemonicfix.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\mnemonicfix\group" mrp="os\buildtools\misccomponents\mnemonicfix\group\tools_sdk_eng_mnemonicfix.mrp"/>
         </component>
         <component name="PATHBROWSER" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\pathbrowser\group" mrp="sf\os\buildtools\misccomponents\pathbrowser\group\tools_sdk_eng_pathbrowser.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\pathbrowser\group" mrp="os\buildtools\misccomponents\pathbrowser\group\tools_sdk_eng_pathbrowser.mrp"/>
         </component>
         <component name="SHELLEXEC" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\shellexec\group" mrp="sf\os\buildtools\misccomponents\shellexec\group\tools_sdk_eng_shellexec.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\shellexec\group" mrp="os\buildtools\misccomponents\shellexec\group\tools_sdk_eng_shellexec.mrp"/>
         </component>
         <component name="SWINGWORKER" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\swingworker\group" mrp="sf\os\buildtools\misccomponents\swingworker\group\tools_sdk_eng_swingworker.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\swingworker\group" mrp="os\buildtools\misccomponents\swingworker\group\tools_sdk_eng_swingworker.mrp"/>
         </component>
         <component name="TESTCASERUNNER" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\testcaserunner\group" mrp="sf\os\buildtools\misccomponents\testcaserunner\group\tools_sdk_eng_testcaserunner.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\testcaserunner\group" mrp="os\buildtools\misccomponents\testcaserunner\group\tools_sdk_eng_testcaserunner.mrp"/>
         </component>
         <component name="TOOLBARPANEL" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\toolbarpanel\group" mrp="sf\os\buildtools\misccomponents\toolbarpanel\group\tools_sdk_eng_toolbarpanel.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\toolbarpanel\group" mrp="os\buildtools\misccomponents\toolbarpanel\group\tools_sdk_eng_toolbarpanel.mrp"/>
         </component>
         <component name="JAVAHELP" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\javahelp\group" mrp="sf\os\buildtools\misccomponents\javahelp\group\tools_sdk_eng_javahelp.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\javahelp\group" mrp="os\buildtools\misccomponents\javahelp\group\tools_sdk_eng_javahelp.mrp"/>
         </component>
         <component name="LANGCONFIG" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\langconfig\group" mrp="sf\os\buildtools\misccomponents\langconfig\group\tools_sdk_eng_langconfig.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\langconfig\group" mrp="os\buildtools\misccomponents\langconfig\group\tools_sdk_eng_langconfig.mrp"/>
         </component>
         <component name="MBMCODEC" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\mbmcodec\group" mrp="sf\os\buildtools\misccomponents\mbmcodec\group\tools_sdk_eng_mbmcodec.mrp"/>
+          <unit bldFile="app\helps\symhelp\mbmcodec\group" mrp="app\helps\symhelp\mbmcodec\group\tools_sdk_eng_mbmcodec.mrp"/>
         </component>
         <component name="SDKINFO" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\sdkinfo\group" mrp="sf\os\buildtools\misccomponents\sdkinfo\group\tools_sdk_eng_sdkinfo.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\sdkinfo\group" mrp="os\buildtools\misccomponents\sdkinfo\group\tools_sdk_eng_sdkinfo.mrp"/>
         </component>
         <component name="JADE" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\jade\group" mrp="sf\os\buildtools\misccomponents\jade\group\tools_sdk_eng_jade.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\jade\group" mrp="os\buildtools\misccomponents\jade\group\tools_sdk_eng_jade.mrp"/>
         </component>
         <component name="CSHLPCMP_GUI" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\cshlpcmpgui\group" mrp="sf\os\buildtools\misccomponents\cshlpcmpgui\group\tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/>
+          <unit bldFile="app\helps\symhelp\cshlpcmpgui\group" mrp="app\helps\symhelp\cshlpcmpgui\group\tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/>
         </component>
         <component name="SDK Package Manager" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\sdkpackagemgr\group" mrp="sf\os\buildtools\misccomponents\sdkpackagemgr\group\tools_sdk_eng_sdkpkg-manager.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\sdkpackagemgr\group" mrp="os\buildtools\misccomponents\sdkpackagemgr\group\tools_sdk_eng_sdkpkg-manager.mrp"/>
         </component>
         <component name="Production Build Tools" filter="gt">
-          <unit mrp="sf\os\unref\comprd\tools\product_tools.mrp"/>
+          <unit mrp="os\buildtools\toolsandutils\productionbldtools\product_tools.mrp"/>
         </component>
         <component name="Production Build CBR Configuration Files" filter="gt">
-          <unit mrp="sf\os\unref\cedprd\tools\makecbr\files\product_cbr_config.mrp"/>
+          <unit mrp="os\deviceplatformrelease\symbianosbld\productionbldcbrconfig\product_cbr_config.mrp"/>
         </component>
         <component name="SDKPKG-TOOLS" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\sdkpkgtools\group" mrp="sf\os\buildtools\misccomponents\sdkpkgtools\group\tools_sdk_eng_sdkpkg-tools.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\sdkpkgtools\group" mrp="os\buildtools\misccomponents\sdkpkgtools\group\tools_sdk_eng_sdkpkg-tools.mrp"/>
         </component>
         <component name="EMULATOR_LAUNCHER" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\emulatorlauncher\group" mrp="sf\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="PKGMGRGUI" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\pkgmgrgui\group" mrp="sf\os\buildtools\misccomponents\pkgmgrgui\group\tools_sdk_eng_pkgmgrgui.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\pkgmgrgui\group" mrp="os\buildtools\misccomponents\pkgmgrgui\group\tools_sdk_eng_pkgmgrgui.mrp"/>
         </component>
         <component name="LAUNCH" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\launch\group" mrp="sf\os\buildtools\misccomponents\launch\group\tools_sdk_eng_launch.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\launch\group" mrp="os\buildtools\misccomponents\launch\group\tools_sdk_eng_launch.mrp"/>
         </component>
         <component name="TOOLS_STUBS" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\toolsstubs\group" mrp="sf\os\buildtools\misccomponents\toolsstubs\group\tools_sdk_eng_tools_stubs.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\toolsstubs\group" mrp="os\buildtools\misccomponents\toolsstubs\group\tools_sdk_eng_tools_stubs.mrp"/>
         </component>
         <component name="BSPBUILDER" filter="gt">
-          <unit bldFile="sf\os\buildtools\misccomponents\bspbuilder\group" mrp="sf\os\buildtools\misccomponents\bspbuilder\group\tools_bspbuilder.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\bspbuilder\group" mrp="os\buildtools\misccomponents\bspbuilder\group\tools_bspbuilder.mrp"/>
         </component>
         <component name="ALP2CSH">
-          <unit bldFile="sf\os\buildtools\misccomponents\alp2csh\group" mrp="sf\os\buildtools\misccomponents\alp2csh\group\tools_sdk_eng_alp2csh.mrp"/>
+          <unit bldFile="os\buildtools\fileconv\alp2csh\group" mrp="os\buildtools\fileconv\alp2csh\group\tools_sdk_eng_alp2csh.mrp"/>
         </component>
         <component name="CJPEG">
-          <unit bldFile="sf\os\buildtools\misccomponents\cjpeg\group" mrp="sf\os\buildtools\misccomponents\cjpeg\group\tools_sdk_eng_cjpeg.mrp"/>
+          <unit bldFile="os\buildtools\fileconv\cjpeg\group" mrp="os\buildtools\fileconv\cjpeg\group\tools_sdk_eng_cjpeg.mrp"/>
         </component>
         <component name="CSHLPCMP Frontend">
-          <unit bldFile="sf\os\buildtools\misccomponents\cshlpcmpfrontend\group" mrp="sf\os\buildtools\misccomponents\cshlpcmpfrontend\group\tools_sdk_eng_cshlpcmp_frontend.mrp"/>
+          <unit bldFile="app\helps\symhelp\cshlpcmpfrontend\group" mrp="app\helps\symhelp\cshlpcmpfrontend\group\tools_sdk_eng_cshlpcmp_frontend.mrp"/>
         </component>
         <component name="CSHLPCMP Backend">
-          <unit mrp="sf\os\buildtools\misccomponents\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="PERLLIBRARY">
-          <unit bldFile="sf\os\buildtools\misccomponents\legacycommonperl\group" mrp="sf\os\buildtools\misccomponents\legacycommonperl\group\tools_sdk_eng_perllibrary.mrp"/>
+          <unit bldFile="os\buildtools\perltoolsplat_os\legacycommonperl\group" mrp="os\buildtools\perltoolsplat_os\legacycommonperl\group\tools_sdk_eng_perllibrary.mrp"/>
         </component>
         <component name="Perl Shared Libraries">
-          <unit bldFile="sf\os\buildtools\misccomponents\commonperl\group" mrp="sf\os\buildtools\misccomponents\commonperl\group\tools_sdk_eng_perl_shared.mrp"/>
+          <unit bldFile="os\buildtools\perltoolsplat_os\commonperl\group" mrp="os\buildtools\perltoolsplat_os\commonperl\group\tools_sdk_eng_perl_shared.mrp"/>
         </component>
         <component name="RTF2PTML">
-          <unit bldFile="sf\os\buildtools\misccomponents\rtf2ptml\group" mrp="sf\os\buildtools\misccomponents\rtf2ptml\group\tools_sdk_eng_rtf2ptml.mrp"/>
+          <unit bldFile="os\buildtools\fileconv\rtf2ptml\group" mrp="os\buildtools\fileconv\rtf2ptml\group\tools_sdk_eng_rtf2ptml.mrp"/>
         </component>
         <component name="SPLASH">
-          <unit bldFile="sf\os\buildtools\misccomponents\splash\group" mrp="sf\os\buildtools\misccomponents\splash\group\tools_sdk_eng_splash.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\splash\group" mrp="os\buildtools\misccomponents\splash\group\tools_sdk_eng_splash.mrp"/>
         </component>
         <component name="SDK Builder">
-          <unit bldFile="sf\os\buildtools\misccomponents\sdkbuilder\group" mrp="sf\os\buildtools\misccomponents\sdkbuilder\group\tools_sdk_eng_sdk_builder.mrp"/>
+          <unit bldFile="os\buildtools\misccomponents\sdkbuilder\group" mrp="os\buildtools\misccomponents\sdkbuilder\group\tools_sdk_eng_sdk_builder.mrp"/>
         </component>
       </collection>
       <collection name="Test Product" level="test">
+		<!-- PLACEHOLDER="DS.1603" START REMOVE-->
         <component name="Bluetooth Test Product" introduced="9.2" class="test">
         </component>
         <component name="Multimedia Test Product">
         </component>
+		<!-- PLACEHOLDER="DS.1603" END REMOVE-->
         <component name="Messaging Test Product">
-          <unit mrp="sf\mw\messagingmw\messagingfw\msgtestproduct\group\messaging_testproduct.mrp"/>
+          <unit mrp="mw\messagingmw\messagingfw\msgtestproduct\group\messaging_testproduct.mrp"/>
         </component>
+		<!-- PLACEHOLDER="DS.1603" START REMOVE-->
         <component name="Syslibs Test Product">
         </component>
         <component name="Comms Infrastructure Test Product" introduced="9.2" class="test">
         </component>
         <component name="Graphics Test Product">
         </component>
+		<!-- PLACEHOLDER="DS.1603" END REMOVE-->
         <component name="LBS Test Product" introduced="9.2" class="test">
-          <unit mrp="sf\os\lbs\locationrequestmgmt\lbstestproduct\group\lbs_testproduct.mrp"/>
+          <unit mrp="os\lbs\lbstest\lbstestproduct\group\lbs_testproduct.mrp"/>
         </component>
       </collection>
     </layer>
     <layer name="HAL" levels="Hardware-dependent">
       <block name="Board Support Packages" level="Hardware-dependent">
+			<collection name="HAI Test Suites">
+		<component name="BSP Verification Suite" class="placeholder" introduced="TB91">
+			<!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/boardsupport/haitest/group/bspsvs.mrp"/>
+			-->
+		</component>
+		</collection>
         <collection name="Emulator">
           <component name="Emulator BSP" contract="Symbian_SD4C">
-            <unit bldFile="sf\os\boardsupport\emulator\emulatorbsp" mrp="sf\os\boardsupport\emulator\emulatorbsp\base_wins.mrp"/>
+            <unit bldFile="os\boardsupport\emulator\emulatorbsp" mrp="os\boardsupport\emulator\emulatorbsp\base_wins.mrp"/>
           </component>
           <component name="Unistore2 Emulator Support" contract="NAND_Flash_XSR_Unistore_2_Other_Portions" filter="gt" introduced="9.4">
-            <unit bldFile="sf\os\boardsupport\emulator\unistore2emulatorsupport" mrp="sf\os\boardsupport\emulator\unistore2emulatorsupport\base_wins_unistore2.mrp"/>
-          </component>
-        </collection>
-        <collection name="Assabet">
-          <component name="Assabet BSP" deprecated="8.0">
-            <unit bldFile="sf\os\boardsupport\assabet\assabetbsp" mrp="sf\os\boardsupport\assabet\assabetbsp\base_assabet.mrp"/>
-          </component>
-          <component name="StrongArm 1100 ASSP" introduced="8.1">
-            <unit mrp="sf\os\boardsupport\assabet\strongarm1100assp\base_sa1100.mrp"/>
-          </component>
-        </collection>
-        <collection name="Integrator BSP">
-          <component name="Integrator Motherboard" introduced="8.1b">
-            <unit bldFile="sf\os\boardsupport\integratorbsp\integratormotherboard" mrp="sf\os\boardsupport\integratorbsp\integratormotherboard\base_integrator_integratorap.mrp"/>
-          </component>
-          <component name="Integrator Core Modules">
-            <unit bldFile="sf\os\boardsupport\integratorbsp\integratorcoremodules" mrp="sf\os\boardsupport\integratorbsp\integratorcoremodules\base_integrator_core_8.1b.mrp"/>
-          </component>
-          <component name="Integrator ARM920 Core Module" introduced="8.1b">
-            <unit bldFile="sf\os\boardsupport\integratorbsp\integratorarm920coremodule" mrp="sf\os\boardsupport\integratorbsp\integratorarm920coremodule\base_integrator_core_cm920.mrp"/>
-          </component>
-          <component name="Integrator ARM1136 Core Module">
-            <unit bldFile="sf\os\boardsupport\integratorbsp\integratorarm1136coremodule" mrp="sf\os\boardsupport\integratorbsp\integratorarm1136coremodule\base_integrator_core_cm1136.mrp"/>
-          </component>
-          <component name="Integrator XX600 Logic Module" introduced="8.1b">
-            <unit bldFile="sf\os\boardsupport\integratorbsp\integratorxx600logicmodule" mrp="sf\os\boardsupport\integratorbsp\integratorxx600logicmodule\base_integrator_logic_lmxx600.mrp"/>
-          </component>
-          <component name="Integrator SSR NAND Logic Module" introduced="8.1b">
-            <unit bldFile="sf\os\boardsupport\integratorbsp\integratorssrnandlogicmodule" mrp="sf\os\boardsupport\integratorbsp\integratorssrnandlogicmodule\base_integrator_logic_lmnand.mrp"/>
-          </component>
-          <component name="Integrator Panasonic Logic Module" contract="SD_Card_PSL">
-            <unit mrp="sf\os\boardsupport\integratorbsp\integratorpanasoniclogicmodule\base_integrator_logic_lm_pana.mrp"/>
-          </component>
-          <component name="Integrator Unistore2 NAND Logic Module" contract="NAND_Flash_XSR_Unistore_2_Other_Portions" filter="gt">
-            <unit bldFile="sf\os\boardsupport\integratorbsp\integratorunistore2nandlogicmodule" mrp="sf\os\boardsupport\integratorbsp\integratorunistore2nandlogicmodule\base_integrator_logic_lmnand2.mrp"/>
+            <unit bldFile="os\boardsupport\emulator\unistore2emulatorsupport" mrp="os\boardsupport\emulator\unistore2emulatorsupport\base_wins_unistore2.mrp"/>
           </component>
         </collection>
         <collection name="OMAP H2">
           <component name="OMAP H2 BSP" introduced="9.0">
-            <unit bldFile="sf\os\boardsupport\omaph2\omaph2bsp\h2" mrp="sf\os\boardsupport\omaph2\omaph2bsp\h2\base_omaph2.mrp"/>
+            <unit bldFile="os\boardsupport\omaph2\omaph2bsp\h2" mrp="os\boardsupport\omaph2\omaph2bsp\h2\base_omaph2.mrp"/>
           </component>
           <component name="OMAP H2 Unistore2" contract="NAND_Flash_XSR_Unistore_2_Other_Portions" filter="gt" introduced="9.1">
-            <unit bldFile="sf\os\boardsupport\omaph2\omaph2unistore2" mrp="sf\os\boardsupport\omaph2\omaph2unistore2\base_h2_unistore2.mrp"/>
+            <unit bldFile="os\boardsupport\omaph2\omaph2unistore2" mrp="os\boardsupport\omaph2\omaph2unistore2\base_h2_unistore2.mrp"/>
           </component>
           <component name="OMAP H2 SDIO" filter="gt" introduced="9.2">
-            <unit bldFile="sf\os\boardsupport\omaph2\omaph2sdio" mrp="sf\os\boardsupport\omaph2\omaph2sdio\base_h2_sdio.mrp"/>
+            <unit bldFile="os\boardsupport\omaph2\omaph2sdio" mrp="os\boardsupport\omaph2\omaph2sdio\base_h2_sdio.mrp"/>
           </component>
         </collection>
         <collection name="OMAP H4">
           <component name="OMAP H4 BSP">
-            <unit bldFile="sf\os\boardsupport\omaph4\omaph4bsp\h4" mrp="sf\os\boardsupport\omaph4\omaph4bsp\h4\base_omaph4hrp.mrp"/>
+            <unit bldFile="os\boardsupport\omaph4\omaph4bsp\h4" mrp="os\boardsupport\omaph4\omaph4bsp\h4\base_omaph4hrp.mrp"/>
           </component>
           <component name="H4 Boot Loader" introduced="9.1">
-            <unit mrp="sf\os\boardsupport\omaph4\h4bootloader\base_omaph4hrp_bootldr.mrp" bldFile="sf\os\boardsupport\omaph4\h4bootloader"/>
+            <unit mrp="os\boardsupport\omaph4\h4bootloader\base_omaph4hrp_bootldr.mrp" bldFile="os\boardsupport\omaph4\h4bootloader"/>
           </component>
           <component name="OMAP H4 Mini Environment Boot Loader" introduced="9.2">
-            <unit mrp="sf\os\boardsupport\omaph4\omaph4minienvbootloader\base_omaph4hrp_mebootldr.mrp" bldFile="sf\os\boardsupport\omaph4\omaph4minienvbootloader"/>
+            <unit mrp="os\boardsupport\omaph4\omaph4minienvbootloader\base_omaph4hrp_mebootldr.mrp" bldFile="os\boardsupport\omaph4\omaph4minienvbootloader"/>
           </component>
           <component name="OMAP H4 Unistore2" contract="NAND_Flash_XSR_Unistore_2_Other_Portions" filter="gt" introduced="9.2">
-            <unit bldFile="sf\os\boardsupport\omaph4\omaph4unistore2" mrp="sf\os\boardsupport\omaph4\omaph4unistore2\base_omaph4hrp_unistore2.mrp"/>
+            <unit bldFile="os\boardsupport\omaph4\omaph4unistore2" mrp="os\boardsupport\omaph4\omaph4unistore2\base_omaph4hrp_unistore2.mrp"/>
           </component>
           <component name="OMAP H4 SDIO" filter="gt" introduced="9.2">
-            <unit bldFile="sf\os\boardsupport\omaph4\omaph4sdio" mrp="sf\os\boardsupport\omaph4\omaph4sdio\base_omaph4hrp_sdio.mrp"/>
+            <unit bldFile="os\boardsupport\omaph4\omaph4sdio" mrp="os\boardsupport\omaph4\omaph4sdio\base_omaph4hrp_sdio.mrp"/>
           </component>
         </collection>
         <collection name="Generic BSP">
           <component name="Template Variant">
-            <unit bldFile="sf\os\kernelhwsrv\bsptemplate\asspandvariant\template_variant" mrp="sf\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>
       </block>
       <collection name="Screen Drivers" level="Hardware-dependent">
         <component name="Screen Driver" plugin="Y" introduced="6.1">
-          <unit bldFile="sf\os\graphics\graphicsdeviceinterface\screendriver\group" mrp="sf\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="Baseband Adaptation Plugins" level="Hardware-dependent">
         <component name="Baseband Channel Adaptor for C32" plugin="Y" introduced="8.1">
-          <unit bldFile="sf\os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group" mrp="sf\os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group\networking_c32bca.mrp"/>
+          <unit bldFile="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group" mrp="os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group\networking_c32bca.mrp"/>
         </component>
       </collection>
     </layer>
@@ -543,142 +514,145 @@
       <block name="Kernel-side Services" level="kernel" levels="generic specific">
         <collection name="Kernel Architecture" level="specific">
           <component name="Kernel Architecture 2" introduced="8.0">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka" mrp="sf\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="Boot Loader" level="generic">
           <component name="Bootstrap" introduced="9.2">
-            <unit mrp="sf\os\kernelhwsrv\brdbootldr\ubootldr\base_ubootldr.mrp"/>
+            <unit mrp="os\kernelhwsrv\brdbootldr\ubootldr\base_ubootldr.mrp"/>
           </component>
         </collection>
         <collection name="Flash Translation Layer" level="generic">
           <component name="Unistore2 Drivers" contract="NAND_Flash_XSR_Unistore_2_Other_Portions" filter="gt" introduced="9.1">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\unistore2" mrp="sf\os\kernelhwsrv\kernel\eka\drivers\unistore2\base_drivers_unistore2.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\unistore2" mrp="os\kernelhwsrv\kernel\eka\drivers\unistore2\base_drivers_unistore2.mrp"/>
           </component>
           <component name="Unistore2 Core" contract="NAND_Flash_XSR_Unistore_2_Core_Portion" filter="gt" introduced="9.1">
-            <unit mrp="sf\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="Unistore2 Crash Logger" contract="NAND_Flash_XSR_Unistore_2_Other_Portions" filter="gt" introduced="9.1">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\crashflash\unistore2" mrp="sf\os\kernelhwsrv\kernel\eka\drivers\crashflash\unistore2\base_crashflash_unistore2.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\crashflash\unistore2" mrp="os\kernelhwsrv\kernel\eka\drivers\crashflash\unistore2\base_crashflash_unistore2.mrp"/>
           </component>
           <component name="Unistore2 Boot Support" contract="NAND_Flash_XSR_Unistore_2_Other_Portions" filter="gt" introduced="9.1">
-            <unit bldFile="sf\os\kernelhwsrv\unistore2\uiibootsupport\nandloader\unistore2" mrp="sf\os\kernelhwsrv\unistore2\uiibootsupport\base_nandboot_unistore2.mrp"/>
+            <unit bldFile="os\kernelhwsrv\unistore2\uiibootsupport\nandloader\unistore2" mrp="os\kernelhwsrv\unistore2\uiibootsupport\base_nandboot_unistore2.mrp"/>
           </component>
         </collection>
         <collection name="Logical Device Drivers" level="specific">
           <component name="Ethernet Driver">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\ethernet" mrp="sf\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="Sound Driver" introduced="8.1b">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\esound" mrp="sf\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>
           <component name="Serial Port Driver">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\ecomm" mrp="sf\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="Legacy Drivers">
-            <unit mrp="sf\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="Local Media Subsystem" introduced="8.1b">
             <!-- these are LDDs for storage media-->
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\locmedia" mrp="sf\os\kernelhwsrv\kernel\eka\drivers\locmedia\base_e32_drivers_locmedia.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\locmedia" mrp="os\kernelhwsrv\kernel\eka\drivers\locmedia\base_e32_drivers_locmedia.mrp"/>
           </component>
           <component name="Run Mode Debugger">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\debug" mrp="sf\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="Kernel Trace Tool">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\trace" mrp="sf\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>
         </collection>
         <collection name="Generic Driver Support" level="generic">
           <component name="SD Card 3C Driver" contract="SD_Card_SD3C" filter="gt" introduced="9.1">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard3c" mrp="sf\os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard3c\base_e32_sd3c.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard3c" mrp="os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard3c\base_e32_sd3c.mrp"/>
           </component>
           <component name="SD Card 4C Driver" contract="SD_Card_SD4C" filter="gt" introduced="9.1">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c" mrp="sf\os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c\base_e32_sd4c.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c" mrp="os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c\base_e32_sd4c.mrp"/>
           </component>
           <component name="Media Drivers">
             <!-- these are for storage media-->
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\media" mrp="sf\os\kernelhwsrv\kernel\eka\drivers\media\base_e32_drivers_media.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\media" mrp="os\kernelhwsrv\kernel\eka\drivers\media\base_e32_drivers_media.mrp"/>
           </component>
           <component name="Generic Board Support Packages">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\bsp" mrp="sf\os\kernelhwsrv\kernel\eka\drivers\bsp\base_e32_drivers_bsp.mrp"/>
-          </component>
-          <component name="System On Chip ASSP" contract="Symbian_SD4C">
-            <unit mrp="sf\os\kernelhwsrv\driversupport\socassp\base_soc.mrp"/>
+            <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\bsp" mrp="os\kernelhwsrv\kernel\eka\drivers\bsp\base_e32_drivers_bsp.mrp"/>
           </component>
         </collection>
         <collection name="Shortlink Logical Device Drivers" level="specific">
           <component name="USB Client Driver" introduced="8.1b">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\drivers\usbc" mrp="sf\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="Localisation" level="specific">
           <component name="Locale Support" contract="Symbian_Affiliate" plugin="Y">
-            <unit bldFile="sf\os\kernelhwsrv\localisation\localesupport" mrp="sf\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>
       </block>
+	  <block name="Kernel and Hardware Services" level="kernel" levels="generic specific">
+	  <collection name="Base API Tests" level="user">
+			<component name="Base Verification Suite" class="placeholder" introduced="TB91">
+			<!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/kernelhwsrv/baseapitest/group/basesvs.mrp"/>
+			-->
+			</component>
+      </collection>
+	  </block>
       <block name="User-side Services" level="user">
         <collection name="User Library and File Server">
           <component name="User Library" contract="Symbian_Kernel">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\euser" mrp="sf\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>
           <component name="Compiler Runtime Support" filter="gt">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\compsupp" mrp="sf\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="File Server" filter="gt">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\group" mrp="sf\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="FAT Filename Conversion Plugins" plugin="Y" introduced="9.1">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fatfilenameconversionplugins\group" mrp="sf\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="NAND Flash Translation Layer" filter="gt" introduced="7.0s" deprecated="9.1">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\sftl" mrp="sf\os\kernelhwsrv\userlibandfileserver\fileserver\sftl\base_f32_sftl.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\sftl" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\sftl\base_f32_sftl.mrp"/>
           </component>
           <component name="Base Starter" filter="gt">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\estart" mrp="sf\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>
         </collection>
         <collection name="File Systems" level="user">
           <component name="ROM File System" filter="gt" plugin="Y">
-            <unit mrp="sf\os\kernelhwsrv\userlibandfileserver\fileserver\srom\base_f32_srom.mrp"/>
+            <unit mrp="os\kernelhwsrv\userlibandfileserver\fileserver\srom\base_f32_srom.mrp"/>
           </component>
           <component name="ROFS" filter="gt" plugin="Y">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\srofs" mrp="sf\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="USB Mass Storage File System" filter="gt" plugin="Y">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\smassstorage" mrp="sf\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>
-          <component name="LFFS" filter="gt" plugin="Y">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\slffs" mrp="sf\os\kernelhwsrv\userlibandfileserver\fileserver\slffs\base_f32_slffs.mrp"/>
-          </component>
-          <component name="FAT32 File System" contract="FAT32" filter="gt" plugin="Y">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\sfat32" mrp="sf\os\kernelhwsrv\userlibandfileserver\fileserver\sfat32\base_f32_sfat32.mrp"/>
+		  <component name="FAT32 File System" contract="FAT32" filter="gt" plugin="Y">
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\sfat32" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\sfat32\base_f32_sfat32.mrp"/>
           </component>
           <component name="FAT File System" filter="gt" plugin="Y">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\sfat" mrp="sf\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="Composite File System" filter="gt" plugin="Y">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\scomp" mrp="sf\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="NTFS" filter="gt" plugin="Y">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\ntfs" mrp="sf\os\kernelhwsrv\userlibandfileserver\fileserver\ntfs\base_f32_sntfs.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\ntfs" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\ntfs\base_f32_sntfs.mrp"/>
           </component>
           <component name="ISO9660 File System" filter="gt" plugin="Y" introduced="8.1b">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\iso9660" mrp="sf\os\kernelhwsrv\userlibandfileserver\fileserver\iso9660\base_f32_siso9660.mrp"/>
+            <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\iso9660" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\iso9660\base_f32_siso9660.mrp"/>
           </component>
         </collection>
         <collection name="HAL Services">
           <component name="User-Side Hardware Abstraction" introduced="6.0">
-            <unit bldFile="sf\os\kernelhwsrv\halservices\hal" mrp="sf\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="Text Mode Shell">
           <component name="Text Window Server">
-            <unit bldFile="sf\os\kernelhwsrv\kernel\eka\ewsrv" mrp="sf\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>
           <component name="Text Shell" filter="gt">
-            <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\fileserver\etshell" mrp="sf\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>
         </collection>
       </block>
@@ -686,485 +660,479 @@
     <layer name="OS Services">
       <block name="Base Services" levels="physical-abstraction app-libs translation data-services utilities">
         <subblock name="Generic OS Services">
+		<collection name="SysLibs API Tests" level="utilities">
+		<component name="Syslibs Verfication Suite" class="placeholder" introduced="TB91">
+			<!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/ossrv/syslibsapitest/group/syslibssvs.mrp"/>
+			-->
+		</component>
+		</collection>
           <collection name="Generic Services" level="utilities">
             <component name="MIME Recognition Framework">
-              <unit bldFile="sf\os\ossrv\genericservices\mimerecognitionfw\group" mrp="sf\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="System Agent" introduced="9.0">
-              <unit bldFile="sf\os\ossrv\genericservices\systemagent\group" mrp="sf\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="Task Scheduler" introduced="6.0">
-              <unit bldFile="sf\os\ossrv\genericservices\taskscheduler\group" mrp="sf\os\ossrv\genericservices\taskscheduler\group\syslibs_schsvr.mrp"/>
+              <unit bldFile="os\ossrv\genericservices\taskscheduler\group" mrp="os\ossrv\genericservices\taskscheduler\group\syslibs_schsvr.mrp"/>
             </component>
             <component name="Active Backup Client">
-              <unit bldFile="sf\os\ossrv\genericservices\activebackupclient\group" mrp="sf\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>
           </collection>
           <collection name="System State Management" level="data-services">
             <component name="System Starter" introduced="9.1">
-              <unit bldFile="sf\os\devicesrv\sysstatemgmt\systemstarter\group" mrp="sf\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>
           </collection>
           <collection name="Crypto Management Libraries" level="data-services">
             <component name="Security Utils" introduced="8.0">
-              <unit bldFile="sf\os\security\cryptomgmtlibs\securityutils\group" mrp="sf\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>
             <component name="Security Config" introduced="9.1">
-              <unit bldFile="sf\os\security\cryptomgmtlibs\securityconfig\group" mrp="sf\os\security\cryptomgmtlibs\securityconfig\group\security_config.mrp"/>
+              <unit bldFile="os\security\securityanddataprivacytools\securityconfig\group" mrp="os\security\securityanddataprivacytools\securityconfig\group\security_config.mrp"/>
             </component>
             <component name="Crypto Token Framework">
-              <unit bldFile="sf\os\security\cryptomgmtlibs\cryptotokenfw\group" mrp="sf\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="File-based Certificate and Key Stores" introduced="8.0">
-              <unit bldFile="sf\os\security\cryptoservices\filebasedcertificateandkeystores\group" mrp="sf\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>
           </collection>
           <collection name="Generic Open Libraries" level="translation">
             <component name="C Standard Library" introduced="ER5">
-              <unit bldFile="sf\os\ossrv\genericopenlibs\cstdlib\group" mrp="sf\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="Open Environment Core" introduced="9.4">
-              <unit bldFile="sf\os\ossrv\genericopenlibs\openenvcore\group" mrp="sf\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="Compression and Crypto Libraries" level="translation">
             <component name="Zip Compression Library" introduced="6.0">
-              <unit bldFile="sf\os\ossrv\compressionlibs\ziplib\group" mrp="sf\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>
             <component name="Weak Cryptography Library" filter="gt">
-              <unit bldFile="sf\os\security\cryptolibs\weakcryptolib\group" mrp="sf\os\security\cryptolibs\weakcryptolib\group\security_crypto_weak.mrp"/>
+              <unit bldFile="os\security\crypto\weakcrypto\group" mrp="os\security\crypto\weakcrypto\group\security_crypto_weak.mrp"/>
             </component>
             <component name="Strong Cryptography Library" contract="Symbian_Strong_Cryptography" filter="gt">
-              <unit bldFile="sf\os\security\cryptolibs\weakcryptolib\strong" mrp="sf\os\security\cryptolibs\weakcryptolib\group\security_crypto_strong.mrp"/>
+              <unit bldFile="os\security\crypto\weakcrypto\strong" mrp="os\security\crypto\weakcrypto\group\security_crypto_strong.mrp"/>
             </component>
           </collection>
           <collection name="Low Level Libraries and Frameworks" level="app-libs">
            <component name="Plugin Framework" introduced="6.2">
-              <unit version="2" bldFile="sf\os\ossrv\lowlevellibsandfws\pluginfw\Group" mrp="sf\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>
             <component name="Application Utilities" introduced="ER5">
-              <unit bldFile="sf\os\ossrv\lowlevellibsandfws\apputils\group" mrp="sf\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>
           </collection>
           <collection name="Resource Management" level="physical-abstraction">
             <component name="Feature Registry" introduced="9.2" deprecated="9.6">
-              <unit bldFile="sf\os\persistentdata\legacyfeaturemgmt\featureregistry\group" mrp="sf\os\persistentdata\legacyfeaturemgmt\featureregistry\group\syslibs_featreg.mrp"/>
+              <unit bldFile="os\persistentdata\featuremgmt\featureregistry\group" mrp="os\persistentdata\featuremgmt\featureregistry\group\syslibs_featreg.mrp"/>
             </component>
             <component name="Hardware Resources Manager" introduced="9.5">
-              <unit bldFile="sf\os\devicesrv\resourcemgmt\hwresourcesmgr\group" mrp="sf\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="Power and Memory Notification Service" introduced="6.0">
-              <unit bldFile="sf\os\devicesrv\resourcemgmt\powerandmemorynotificationservice\group" mrp="sf\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="Domain Manager" introduced="8.1b">
-              <unit bldFile="sf\os\kernelhwsrv\userlibandfileserver\domainmgr\group" mrp="sf\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>
           </collection>
           <collection name="Character Conversion Framework" level="utilities">
             <component name="Character Encoding and Conversion Framework">
-              <unit bldFile="sf\os\textandloc\charconvfw\charconv_fw\group" mrp="sf\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="Character Encoding and Conversion Plugins" plugin="Y">
-              <unit bldFile="sf\os\textandloc\charconvfw\charconvplugins\group" mrp="sf\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>
           </collection>
         </subblock>
         <subblock name="Persistent Data Services">
           <collection name="Logging Services" level="utilities">
             <component name="Event Logger" introduced="6.0">
-              <unit bldFile="sf\os\persistentdata\loggingservices\eventlogger\group" mrp="sf\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="File Logger" introduced="ER5">
-              <unit bldFile="sf\os\persistentdata\loggingservices\filelogger\group" mrp="sf\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="Comms Debug Utility" introduced="7.0s">
-              <unit bldFile="sf\os\persistentdata\traceservices\commsdebugutility\group" mrp="sf\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="Trace Framework">
-              <unit bldFile="sf\os\persistentdata\traceservices\tracefw\ulogger\group" mrp="sf\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>
           </collection>
           <collection name="Content Management" level="data-services">
             <component name="Content Access Framework for DRM" introduced="9.1">
-              <unit bldFile="sf\os\security\contentmgmt\contentaccessfwfordrm\group" mrp="sf\os\security\contentmgmt\contentaccessfwfordrm\group\security_caf2.mrp"/>
+              <unit bldFile="os\security\contentmgmt\contentaccessfwfordrm\group" mrp="os\security\contentmgmt\contentaccessfwfordrm\group\security_caf2.mrp"/>
             </component>
             <component name="CAF Recogniser Config" introduced="9.1">
-              <unit bldFile="sf\os\security\contentmgmt\cafrecogniserconfig" mrp="sf\os\security\contentmgmt\cafrecogniserconfig\security_reccafconfig.mrp"/>
+              <unit bldFile="os\security\contentmgmt\cafrecogniserconfig" mrp="os\security\contentmgmt\cafrecogniserconfig\security_reccafconfig.mrp"/>
             </component>
           </collection>
           <collection name="XML" level="translation">
             <component name="XML Framework" introduced="7.0s">
-              <unit bldFile="sf\os\xmlsrv\xml\xmlfw\group" mrp="sf\os\xmlsrv\xml\xmlfw\group\syslibs_xml.mrp"/>
+              <unit bldFile="os\xmlsrv\xml\xmlfw\group" mrp="os\xmlsrv\xml\xmlfw\group\syslibs_xml.mrp"/>
             </component>
             <component name="XML Parser" plugin="Y" introduced="7.0s">
-              <unit bldFile="sf\os\xmlsrv\xml\xmlexpatparser\group" mrp="sf\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="WBXML Parser" plugin="Y" introduced="7.0s">
-              <unit bldFile="sf\os\xmlsrv\xml\wbxmlparser\group" mrp="sf\os\xmlsrv\xml\wbxmlparser\group\syslibs_wbxmlparser.mrp"/>
+              <unit bldFile="os\xmlsrv\xml\wbxmlparser\group" mrp="os\xmlsrv\xml\wbxmlparser\group\syslibs_wbxmlparser.mrp"/>
             </component>
           </collection>
           <collection name="Persistent Storage" level="app-libs">
             <component name="Store">
-              <unit bldFile="sf\os\persistentdata\persistentstorage\store\group" mrp="sf\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>
             <component name="DBMS">
-              <unit bldFile="sf\os\persistentdata\persistentstorage\dbms\group" mrp="sf\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="DBMS Emulation Library" introduced="9.3">
-              <unit bldFile="sf\os\persistentdata\databaseabstraction\dbmsemulationlib\group" mrp="sf\os\persistentdata\databaseabstraction\dbmsemulationlib\group\syslibs_dbmssql.mrp"/>
-            </component>
-            <component name="Central Repository" introduced="7.0s">
-              <unit bldFile="sf\os\persistentdata\persistentstorage\centralrepository\group" mrp="sf\os\persistentdata\persistentstorage\centralrepository\group\syslibs_centralrepository.mrp"/>
+			<component name="Central Repository" introduced="7.0s">
+              <unit bldFile="os\persistentdata\persistentstorage\centralrepository\group" mrp="os\persistentdata\persistentstorage\centralrepository\group\syslibs_centralrepository.mrp"/>
             </component>
             <component name="SQL" introduced="9.3">
-              <unit bldFile="sf\os\persistentdata\persistentstorage\sql\GROUP" mrp="sf\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>
           </collection>
         </subblock>
       </block>
       <block name="Comms Services" levels="physical-abstraction bearer-manager internal-utils servers_and_extensions utilities">
         <subblock name="Communications Framework">
+		<collection name="Comms-Infras API Tests" level="utilities">
+		<component name="Comms Infrastructure Verification Suite" class="placeholder" introduced="TB91">
+			<!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/commsfw/commsinfrastructureapitest/group/commsinfrastructuresvs.mrp"/>
+			-->
+		</component>
+		</collection>
           <collection name="Comms Process and Settings" level="utilities">
             <component name="Comms Root Server" introduced="7.0s">
-              <unit bldFile="sf\os\commsfw\commsprocessandsettings\commsrootserver\group" mrp="sf\os\commsfw\commsprocessandsettings\commsrootserver\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="Comms Root Server Config" introduced="9.1" class="config">
-              <unit mrp="sf\os\commsfw\commsprocessandsettings\commsrootserver\group\comms-infras_rootserver-config.mrp"/>
+              <unit mrp="os\commsfw\commsprocess\commsrootserverconfig\group\comms-infras_rootserver-config.mrp"/>
             </component>
           </collection>
           <collection name="Comms Config. Utils" level="servers_and_extensions">
             <component name="Comms Database">
-              <unit bldFile="sf\os\commsfw\commsconfigutils\commsdatabase\group" mrp="sf\os\commsfw\commsconfigutils\commsdatabase\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="Comms Database Shim" introduced="8.1">
-              <unit bldFile="sf\os\commsfw\commsconfigutils\commsdatabaseshim\group" mrp="sf\os\commsfw\commsconfigutils\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="Data Comms Server" level="servers_and_extensions">
             <component name="ESock Server">
-              <unit version="2" bldFile="sf\os\commsfw\datacommsserver\esockserver\version2\group" mrp="sf\os\commsfw\datacommsserver\esockserver\version2\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="ESock Server Config" introduced="9.1" class="config">
-              <unit version="2" mrp="sf\os\commsfw\datacommsserver\esockserver\version2\group\comms-infras_esock-config.mrp"/>
+              <unit version="2" mrp="os\commsfw\datacommsserver\esockserver\group\comms-infras_esock-config.mrp"/>
             </component>
             <component name="Network Interface Manager" introduced="ER5U">
-              <unit version="1" bldFile="sf\os\commsfw\datacommsserver\networkinterfacemgr\group" mrp="sf\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="Networking Dialog API" introduced="6.1">
-              <unit bldFile="sf\os\commsfw\datacommsserver\networkingdialogapi\group" mrp="sf\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="Network Controller" plugin="Y" introduced="7.0s">
-              <unit bldFile="sf\os\commsfw\datacommsserver\networkcontroller\group" mrp="sf\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>
           </collection>
           <collection name="Serial Server" level="bearer-manager">
             <component name="C32 Serial Server" introduced="ER5">
-              <unit bldFile="sf\os\commsfw\serialserver\c32serialserver\group" mrp="sf\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="C32 Serial Server Config" introduced="ER5" class="config">
-              <unit bldFile="sf\os\commsfw\serialserver\c32serialserverconfig" mrp="sf\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>
           </collection>
           <collection name="Comms Framework Utilities" level="internal-utils">
             <component name="Comms Framework" introduced="7.0s">
-              <unit bldFile="sf\os\commsfw\commsfwutils\commfw\group" mrp="sf\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="Comms Elements" introduced="8.0">
-              <unit bldFile="sf\os\commsfw\commsfwutils\commselements\group" mrp="sf\os\commsfw\commsfwutils\commselements\group\comms-infras_elements.mrp"/>
+              <unit bldFile="os\commsfw\commsfwsupport\commselements\group" mrp="os\commsfw\commsfwsupport\commselements\group\comms-infras_elements.mrp"/>
             </component>
             <component name="MBuf Manager" introduced="7.0s">
-              <unit bldFile="sf\os\commsfw\commsfwutils\mbufmgr\group" mrp="sf\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="Base Connection Providers" level="internal-utils">
             <component name="Reference CPR" plugin="Y" introduced="9.2">
-              <unit bldFile="sf\os\commsfw\baseconnectionproviders\refcpr\group" mrp="sf\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="Reference SCPR" plugin="Y" introduced="9.2">
-              <unit bldFile="sf\os\commsfw\baseconnectionproviders\refscpr\group" mrp="sf\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="Baseband Abstraction" level="physical-abstraction">
             <component name="Baseband Channel Adaptor" introduced="8.1">
-              <unit bldFile="sf\os\cellularsrv\basebandabstraction\basebandchanneladaptor\group" mrp="sf\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="Inter-System Communication" filter="gt" introduced="9.5">
-              <unit bldFile="sf\os\cellularsrv\basebandabstraction\intersystemcomm\group" mrp="sf\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>
           </collection>
         </subblock>
         <subblock name="Cellular Baseband Services">
           <collection name="Telephony Utilities" level="utilities">
             <component name="Dial" deprecated="9.1">
-              <unit bldFile="sf\os\cellularsrv\telephonyutils\dial\group" mrp="sf\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="Telephony Watchers" plugin="Y">
-              <unit bldFile="sf\os\cellularsrv\telephonyutils\telephonywatchers\group" mrp="sf\os\cellularsrv\telephonyutils\telephonywatchers\group\telephony_watchers.mrp"/>
+              <unit bldFile="os\cellularsrv\telephonyutils\telephonywatchers\group" mrp="os\cellularsrv\telephonyutils\telephonywatchers\group\telephony_watchers.mrp"/>
             </component>
             <component name="ETel 3rd Party API" introduced="7.0">
-              <unit bldFile="sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Group" mrp="sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Group\telephony_etel3rdparty.mrp"/>
+              <unit bldFile="os\cellularsrv\telephonyutils\etel3rdpartyapi\Group" mrp="os\cellularsrv\telephonyutils\etel3rdpartyapi\Group\telephony_etel3rdparty.mrp"/>
             </component>
           </collection>
           <collection name="Fax" level="utilities">
             <component name="Fax Client and Server">
-              <unit bldFile="sf\os\cellularsrv\fax\faxclientandserver\Group" mrp="sf\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="Telephony Server" level="servers_and_extensions">
             <component name="ETel Server and Core">
-              <unit bldFile="sf\os\cellularsrv\telephonyserver\etelserverandcore\group" mrp="sf\os\cellularsrv\telephonyserver\etelserverandcore\group\telephony_etel.mrp"/>
+              <unit bldFile="os\cellularsrv\telephonyserver\etelserverandcore\group" mrp="os\cellularsrv\telephonyserver\etelserverandcore\group\telephony_etel.mrp"/>
             </component>
             <component name="ETel Config">
-              <unit mrp="sf\os\cellularsrv\telephonyserver\etelserverandcore\group\telephony_etel-config.mrp"/>
+              <unit mrp="os\cellularsrv\telephonyserver\etelserverandcore\group\telephony_etel-config.mrp"/>
             </component>
             <component name="ETel Multimode" introduced="7.0">
-              <unit bldFile="sf\os\cellularsrv\telephonyserver\etelmultimode\group" mrp="sf\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="ETel Packet Data" introduced="7.0">
-              <unit bldFile="sf\os\cellularsrv\telephonyserver\etelpacketdata\group" mrp="sf\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="ETel SIM Toolkit" introduced="6.1">
-              <unit bldFile="sf\os\cellularsrv\telephonyserver\etelsimtoolkit\group" mrp="sf\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="ETel CDMA" introduced="7.0s">
-              <unit bldFile="sf\os\cellularsrv\telephonyserver\etelcdma\group" mrp="sf\os\cellularsrv\telephonyserver\etelcdma\group\telephony_etelcdma.mrp"/>
+              <unit bldFile="os\cellularsrv\telephonyserver\etelcdma\group" mrp="os\cellularsrv\telephonyserver\etelcdma\group\telephony_etelcdma.mrp"/>
             </component>
           </collection>
           <collection name="SMS Protocols" level="internal-utils">
             <component name="SMS Stack" contract="SMS_MTM" plugin="Y">
-              <unit bldFile="sf\os\cellularsrv\smsprotocols\smsstack\group" mrp="sf\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>
             <component name="CDMA SMS Stack" plugin="Y" introduced="8.0">
-              <unit bldFile="sf\os\cellularsrv\smsprotocols\cdmasmsstack\group" mrp="sf\os\cellularsrv\smsprotocols\cdmasmsstack\group\nbprotocols_cdmasmsstack.mrp"/>
+              <unit bldFile="os\cellularsrv\smsprotocols\cdmasmsstack\group" mrp="os\cellularsrv\smsprotocols\cdmasmsstack\group\nbprotocols_cdmasmsstack.mrp"/>
             </component>
           </collection>
           <collection name="Telephony Server Plugins" level="physical-abstraction">
             <component name="Common TSY">
-              <unit bldFile="sf\os\cellularsrv\telephonyserverplugins\common_tsy\group" mrp="sf\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="Multimode TSY" plugin="Y">
-              <unit bldFile="sf\os\cellularsrv\telephonyserverplugins\multimodetsy\group" mrp="sf\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="CDMA TSY" plugin="Y">
-              <unit bldFile="sf\os\cellularsrv\telephonyserverplugins\cdmatsy\group" mrp="sf\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="SIM TSY" plugin="Y" introduced="7.0" class="test">
-              <unit bldFile="sf\os\cellularsrv\telephonyserverplugins\simtsy\group" mrp="sf\os\cellularsrv\telephonyserverplugins\simtsy\group\telephony_simtsy.mrp"/>
+              <unit bldFile="os\cellularsrv\telephonyserverplugins\simtsy\group" mrp="os\cellularsrv\telephonyserverplugins\simtsy\group\telephony_simtsy.mrp"/>
             </component>
+			<component name="LicenseeTSY Stub" plugin="Y" introduced="tb91" class="test"> 
+			<unit mrp="os\cellularsrv\telephonyserverplugins\licenseetsystub\group\licenseetsystub.mrp"/> 
+			</component>
           </collection>
-          <!-- PLACEHOLDER="DS.1577" START REMOVE -->
-		  <collection name="Telephony Reference Platform" level="physical-abstraction">
-            <component name="TRP TSY" plugin="Y">
-              <unit bldFile="sf\os\cellularsrv\telephonyreferenceplatform\trptsy\group" mrp="sf\os\cellularsrv\telephonyreferenceplatform\trptsy\group\telephony_trp.mrp"/>
-            </component>
-            <component name="TRP AGT" introduced="9.4" plugin="Y">
-              <unit bldFile="sf\os\cellularsrv\telephonyreferenceplatform\trptsy\agt\trpagt\group" mrp="sf\os\cellularsrv\telephonyreferenceplatform\trptsy\agt\trpagt\group\telephony_trpagt.mrp"/> 
-            </component>
-          </collection>
-		  <!-- PLACEHOLDER="DS.1577" END REMOVE -->
 		  <collection name="Hardware Plugin Simulation" level="physical-abstraction">
  	        <component name="MockSY" introduced="9.4" plugin="Y">
- 			<!-- PLACEHOLDER="PDEF130159"
- 			  <unit bldFile="sf\os/unref/orphan/comgen/telephony/tools/mocksy/group" mrp="sf\os/unref/orphan/comgen/telephony/tools/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>
         </subblock>
         <subblock name="Networking Services">
           <collection name="TCP/IP Utilities" level="utilities">
             <component name="DND" introduced="7.0">
-              <unit bldFile="sf\os\networkingsrv\tcpiputils\dnd\group" mrp="sf\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="DND Config" introduced="7.0" class="config">
-              <unit mrp="sf\os\networkingsrv\tcpiputils\dnd\group\networking_dnd-config.mrp"/>
+              <unit mrp="os\networkingsrv\tcpiputils\dnd\group\networking_dnd-config.mrp"/>
             </component>
             <component name="DHCP" introduced="8.0">
-              <unit bldFile="sf\os\networkingsrv\tcpiputils\dhcp\group" mrp="sf\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="Network Address and Port Translation" plugin="Y" introduced="9.4">
-              <unit bldFile="sf\os\networkingsrv\tcpiputils\networkaddressandporttranslation\group" mrp="sf\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>
           <collection name="ESock API Extensions" level="utilities">
             <component name="Internet Sockets" introduced="ER5">
-              <unit bldFile="sf\os\networkingsrv\esockapiextensions\internetsockets\group" mrp="sf\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="Network Protocols" level="servers_and_extensions">
             <component name="IP Event Notifier" plugin="Y" introduced="8.1">
-              <unit bldFile="sf\os\networkingsrv\networkprotocols\ipeventnotifier\group" mrp="sf\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="TCP/IPv4/v6 PRT" plugin="Y" introduced="7.0">
-              <unit bldFile="sf\os\networkingsrv\networkprotocols\tcpipv4v6prt\group" mrp="sf\os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6.mrp"/>
+              <unit bldFile="os\networkingsrv\networkprotocols\tcpipv4v6prt\group" mrp="os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6.mrp"/>
             </component>
             <component name="TCP/IPv4/v6 Config" introduced="7.0" class="config">
-              <unit mrp="sf\os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6-config.mrp"/>
+              <unit mrp="os\networkingsrv\networkprotocols\tcpipv4v6prt\group\networking_tcpip6-config.mrp"/>
             </component>
             <component name="IP Hook" introduced="7.0">
-              <unit bldFile="sf\os\networkingsrv\networkprotocols\iphook\inhook6\group" mrp="sf\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="Mobile IP" plugin="Y" introduced="8.1">
-              <unit bldFile="sf\os\networkingsrv\networkprotocols\mobileip\group" mrp="sf\os\networkingsrv\networkprotocols\mobileip\group\networking_mobileip.mrp"/>
+              <unit bldFile="os\networkingsrv\networkprotocols\mobileip\group" mrp="os\networkingsrv\networkprotocols\mobileip\group\networking_mobileip.mrp"/>
             </component>
           </collection>
           <collection name="Network Control" level="internal-utils">
             <component name="QoS Framework Config" contract="IPv6_QOS" introduced="7.0s" class="config">
-              <unit mrp="sf\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="QoS Library" contract="IPv6_QOS" introduced="7.0s">
-              <unit bldFile="sf\os\networkingsrv\networkcontrol\qoslib\group" mrp="sf\os\networkingsrv\networkcontrol\qoslib\group\networking_qoslib.mrp"/>
+              <unit bldFile="os\networkingsrv\networkcontrol\qoslib\group" mrp="os\networkingsrv\networkcontrol\qoslib\group\networking_qoslib.mrp"/>
             </component>
             <component name="PF QoS Library" contract="IPv6_QOS" introduced="7.0s">
-              <unit bldFile="sf\os\networkingsrv\networkcontrol\pfqoslib\group" mrp="sf\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="QoS Framework PRT" contract="IPv6_QOS" plugin="Y" introduced="7.0s">
-              <unit bldFile="sf\os\networkingsrv\networkcontrol\qosfwconfig\qos\group" mrp="sf\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="IP CPR" plugin="Y" introduced="8.1">
-              <unit bldFile="sf\os\networkingsrv\networkcontrol\ipcpr\group" mrp="sf\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="IP SCPR" plugin="Y" introduced="9.1">
-              <unit bldFile="sf\os\networkingsrv\networkcontrol\ipscpr\group" mrp="sf\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="IP CPR Shim" plugin="Y" deprecated="9.6">
-              <unit bldFile="sf\os\networkingsrv\networkcontrol\ipcprshim\group" mrp="sf\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>
           </collection>
           <collection name="Link Layer Control" level="physical-abstraction">
             <component name="CSD AGT" plugin="Y" introduced="6.1">
-              <unit bldFile="sf\os\cellularsrv\telephonyprotocols\csdagt\group" mrp="sf\os\cellularsrv\telephonyprotocols\csdagt\group\networking_csdagt.mrp"/>
+              <unit bldFile="os\cellularsrv\telephonyprotocols\csdagt\group" mrp="os\cellularsrv\telephonyprotocols\csdagt\group\networking_csdagt.mrp"/>
             </component>
             <component name="PSD AGT" plugin="Y" introduced="7.0s">
-              <unit bldFile="sf\os\cellularsrv\telephonyprotocols\psdagt\group" mrp="sf\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="NULL AGT" plugin="Y" introduced="7.0s">
-              <unit bldFile="sf\os\networkingsrv\linklayercontrol\nullagt\group" mrp="sf\os\networkingsrv\linklayercontrol\nullagt\group\networking_nullagt.mrp"/>
+              <unit bldFile="os\networkingsrv\linklayercontrol\nullagt\group" mrp="os\networkingsrv\linklayercontrol\nullagt\group\networking_nullagt.mrp"/>
             </component>
             <component name="GPRS/UMTS QoS PRT" contract="IPv6_QOS" plugin="Y" introduced="7.0s">
-              <unit bldFile="sf\os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group" mrp="sf\os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group\networking_guqos.mrp"/>
+              <unit bldFile="os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group" mrp="os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group\networking_guqos.mrp"/>
             </component>
             <component name="GPRS/UMTS QoS Interface" plugin="Y" introduced="7.0s">
-              <unit bldFile="sf\os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group" mrp="sf\os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group\networking_umtsif.mrp"/>
+              <unit bldFile="os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group" mrp="os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group\networking_umtsif.mrp"/>
             </component>
             <component name="QoS Extn API" contract="IPv6_QOS" introduced="9.2">
-              <unit bldFile="sf\os\cellularsrv\telephonyprotocols\qosextnapi\group" mrp="sf\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="Secondary PDP context UMTS Driver">
-              <unit bldFile="sf\os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group" mrp="sf\os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group\networking_spud.mrp"/>
+              <unit bldFile="os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group" mrp="os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group\networking_spud.mrp"/>
             </component>
             <component name="UMTS/GPRS SCPR" plugin="Y" introduced="8.1">
-              <unit bldFile="sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr\group" mrp="sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr\group\networking_UmtsGprsSCPR.mrp"/>
+              <unit bldFile="os\cellularsrv\telephonyprotocols\umtsgprsscpr\group" mrp="os\cellularsrv\telephonyprotocols\umtsgprsscpr\group\networking_UmtsGprsSCPR.mrp"/>
             </component>
             <component name="QoS 3GPP CPR" plugin="Y" introduced="9.2">
-              <unit bldFile="sf\os\cellularsrv\telephonyprotocols\qos3gppcpr\group" mrp="sf\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>
           </collection>
           <collection name="Link Layer Protocols" level="bearer-manager">
             <component name="Ethernet NIF" plugin="Y">
-              <unit bldFile="sf\os\networkingsrv\linklayerprotocols\ethernetnif\group" mrp="sf\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="Ethernet Packet Driver" plugin="Y">
-              <unit mrp="sf\os\networkingsrv\linklayerprotocols\ethernetpacketdriver\group\networking_etherdrv_srconly.mrp"/>
+              <unit mrp="os\networkingsrv\linklayerprotocols\ethernetpacketdriver\group\networking_etherdrv_srconly.mrp"/>
             </component>
             <component name="PPP NIF" plugin="Y">
-              <unit version="1" bldFile="sf\os\networkingsrv\linklayerprotocols\pppnif\group" mrp="sf\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="PPP Config">
-              <unit version="1" mrp="sf\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="SLIP NIF" plugin="Y">
-              <unit bldFile="sf\os\networkingsrv\linklayerprotocols\slipnif\group" mrp="sf\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="Tunnel NIF" plugin="Y">
-              <unit bldFile="sf\os\networkingsrv\linklayerprotocols\tunnelnif\group" mrp="sf\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>
             <component name="Raw IP NIF">
-              <unit bldFile="sf\os\cellularsrv\telephonyprotocols\rawipnif\group" mrp="sf\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="Wireless LAN" filter="gt" introduced="9.3">
-              <unit bldFile="sf\os\wlan\wlan_bearer\wirelesslan\group" mrp="sf\os\wlan\wlan_bearer\wirelesslan\group\networking_802.11.mrp"/>
-            </component>
-          </collection>
+		</collection>
           <collection name="PPP Compression Plugins" level="bearer-manager">
             <component name="Predictor Compression" plugin="Y">
-              <unit bldFile="sf\os\networkingsrv\pppcompressionplugins\predictorcompression\group" mrp="sf\os\networkingsrv\pppcompressionplugins\predictorcompression\group\networking_predcomp.mrp"/>
-            </component>
-            <component name="MPPC" contract="MPPC_LZS_Compression_Libraries" filter="gt" plugin="Y">
-              <unit bldFile="sf\os\networkingsrv\pppcompressionplugins\mppc\group" mrp="sf\os\networkingsrv\pppcompressionplugins\mppc\group\networking_mscomp.mrp"/>
-            </component>
-            <component name="Stac LZS Compression" contract="MPPC_LZS_Compression_Libraries" filter="gt" plugin="Y">
-              <unit bldFile="sf\os\networkingsrv\pppcompressionplugins\staclzscompression\group" mrp="sf\os\networkingsrv\pppcompressionplugins\staclzscompression\group\networking_staccomp.mrp"/>
+              <unit bldFile="os\networkingsrv\pppcompressionplugins\predictorcompression\group" mrp="os\networkingsrv\pppcompressionplugins\predictorcompression\group\networking_predcomp.mrp"/>
             </component>
           </collection>
           <collection name="Link Layer Utilities" level="bearer-manager">
-            <component name="EAP Framework" filter="gt" introduced="9.3">
-              <unit bldFile="sf\mw\accesssec\eapol\eapfw\group" mrp="sf\mw\accesssec\eapol\eapfw\group\networking_eap.mrp"/>
-            </component>
-            <component name="Packet Logger" introduced="8.1" class="test">
-              <unit bldFile="sf\os\networkingsrv\linklayerutils\packetlogger\group" mrp="sf\os\networkingsrv\linklayerutils\packetlogger\group\networking_packetlogger.mrp"/>
+		  <component name="Packet Logger" introduced="8.1" class="test">
+              <unit bldFile="os\networkingsrv\linklayerutils\packetlogger\group" mrp="os\networkingsrv\linklayerutils\packetlogger\group\networking_packetlogger.mrp"/>
             </component>
           </collection>
         </subblock>
         <subblock name="Short Link Services">
+		<collection name="Bluetooth API Tests" level="utilities">
+			<component name="Bluetooth Verification Suite" class="placeholder" introduced="TB91">
+			<!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/shortlinksrv/bluetoothapitest/group/bluetoothsvs.mrp"/>
+			-->
+			</component>
+		</collection>
           <collection name="USB Management" level="utilities">
             <component name="USB Manager">
-              <unit version="2" bldFile="sf\os\shortlinksrv\usbmgmt\usbmgr\group" mrp="sf\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>
           </collection>
           <collection name="Short Link" level="servers_and_extensions">
             <component name="Bluetooth HCI Framework 2" introduced="9.2">
-              <unit bldFile="sf\os\shortlinksrv\bthci\bthci2\group" mrp="sf\os\shortlinksrv\bthci\bthci2\group\bluetooth_hci_v2_framework.mrp"/>
+              <unit bldFile="os\shortlinksrv\bthci\bthci2\group" mrp="os\shortlinksrv\bthci\bthci2\group\bluetooth_hci_v2_framework.mrp"/>
             </component>
             <component name="Bluetooth SDP">
-              <unit bldFile="sf\os\shortlinksrv\bluetooth\btsdp" mrp="sf\os\shortlinksrv\bluetooth\btsdp\bluetooth_sdp.mrp"/>
+              <unit bldFile="os\shortlinksrv\bluetooth\btsdp" mrp="os\shortlinksrv\bluetooth\btsdp\bluetooth_sdp.mrp"/>
             </component>
             <component name="Remote Control Framework" introduced="9.1">
-              <unit bldFile="sf\os\devicesrv\accessoryservices\remotecontrolfw\group" mrp="sf\os\devicesrv\accessoryservices\remotecontrolfw\group\bluetooth_remotecontrol.mrp"/>
+              <unit bldFile="os\devicesrv\accessoryservices\remotecontrolfw\group" mrp="os\devicesrv\accessoryservices\remotecontrolfw\group\bluetooth_remotecontrol.mrp"/>
             </component>
           </collection>
           <collection name="Host Controller Interface" level="servers_and_extensions">
             <component name="Bluetooth HCI Framework 1" introduced="6.0">
-              <unit bldFile="sf\os\shortlinksrv\bthci\bthci1" mrp="sf\os\shortlinksrv\bthci\bthci1\bluetooth_hci.mrp"/>
+              <unit bldFile="os\shortlinksrv\bthci\bthci1" mrp="os\shortlinksrv\bthci\bthci1\bluetooth_hci.mrp"/>
             </component>
             <component name="Bluetooth HCI Extension Interface" introduced="6.1">
-              <unit bldFile="sf\os\shortlinksrv\bthci\hciextensioninterface" mrp="sf\os\shortlinksrv\bthci\hciextensioninterface\bluetooth_hciproxy.mrp"/>
+              <unit bldFile="os\shortlinksrv\bthci\hciextensioninterface" mrp="os\shortlinksrv\bthci\hciextensioninterface\bluetooth_hciproxy.mrp"/>
             </component>
             <component name="Bluetooth HCI 2 Reference Implementations" plugin="Y" introduced="9.2">
-              <unit bldFile="sf\os\shortlinksrv\bthci\hci2implementations\group" mrp="sf\os\shortlinksrv\bthci\hci2implementations\group\bluetooth_hci_v2_implementations.mrp"/>
+              <unit bldFile="os\shortlinksrv\bthci\hci2implementations\group" mrp="os\shortlinksrv\bthci\hci2implementations\group\bluetooth_hci_v2_implementations.mrp"/>
             </component>
           </collection>
           <collection name="Bluetooth" level="internal-utils">
             <component name="Bluetooth Manager">
-              <unit bldFile="sf\os\shortlinksrv\bluetoothmgmt\btmgr" mrp="sf\os\shortlinksrv\bluetoothmgmt\btmgr\bluetooth_manager.mrp"/>
+              <unit bldFile="os\shortlinksrv\bluetoothmgmt\btmgr" mrp="os\shortlinksrv\bluetoothmgmt\btmgr\bluetooth_manager.mrp"/>
             </component>
             <component name="Bluetooth Notifiers Support">
-              <unit bldFile="sf\os\shortlinksrv\bluetooth\btextnotifiers" mrp="sf\os\shortlinksrv\bluetooth\btextnotifiers\bluetooth_btextnotifiers.mrp"/>
+              <unit bldFile="os\shortlinksrv\bluetooth\btextnotifiers" mrp="os\shortlinksrv\bluetooth\btextnotifiers\bluetooth_btextnotifiers.mrp"/>
             </component>
             <component name="Bluetooth Config" class="config">
-              <unit bldFile="sf\os\shortlinksrv\bluetoothmgmt\btconfig" mrp="sf\os\shortlinksrv\bluetoothmgmt\btconfig\bluetooth_config.mrp"/>
+              <unit bldFile="os\shortlinksrv\bluetoothmgmt\btconfig" mrp="os\shortlinksrv\bluetoothmgmt\btconfig\bluetooth_config.mrp"/>
             </component>
             <component name="Bluetooth GAVDP" introduced="8.1">
-              <unit bldFile="sf\os\shortlinksrv\bluetooth\gavdp\group" mrp="sf\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="Bluetooth ROM" introduced="9.1">
-              <unit bldFile="sf\os\shortlinksrv\bluetoothmgmt\btrom" mrp="sf\os\shortlinksrv\bluetoothmgmt\btrom\bluetooth_rom.mrp"/>
+              <unit bldFile="os\shortlinksrv\bluetoothmgmt\btrom" mrp="os\shortlinksrv\bluetoothmgmt\btrom\bluetooth_rom.mrp"/>
             </component>
             <component name="Bluetooth Client Library">
-              <unit bldFile="sf\os\shortlinksrv\bluetoothmgmt\bluetoothclientlib" mrp="sf\os\shortlinksrv\bluetoothmgmt\bluetoothclientlib\bluetooth_user.mrp"/>
+              <unit bldFile="os\shortlinksrv\bluetoothmgmt\bluetoothclientlib" mrp="os\shortlinksrv\bluetoothmgmt\bluetoothclientlib\bluetooth_user.mrp"/>
             </component>
             <component name="Bluetooth Build Utilities">
-              <unit mrp="sf\os\shortlinksrv\bluetoothmgmt\btcommon\bluetooth_common.mrp"/>
+              <unit mrp="os\shortlinksrv\bluetoothmgmt\btcommon\bluetooth_common.mrp"/>
             </component>
           </collection>
           <collection name="Short Link Protocol Plugins" level="bearer-manager">
             <component name="Bluetooth Stack" introduced="6.0">
-              <unit bldFile="sf\os\shortlinksrv\bluetooth\btstack" mrp="sf\os\shortlinksrv\bluetooth\btstack\bluetooth_stack.mrp"/>
+              <unit bldFile="os\shortlinksrv\bluetooth\btstack" mrp="os\shortlinksrv\bluetooth\btstack\bluetooth_stack.mrp"/>
             </component>
             <component name="IrDA Stack">
-              <unit bldFile="sf\os\shortlinksrv\irda\irdastack\group" mrp="sf\os\shortlinksrv\irda\irdastack\group\infra-red_irda.mrp"/>
-            </component>
-            <component name="IrDA Config" introduced="6.0" class="config">
-              <unit bldFile="sf\os\shortlinksrv\irda\irdaconfig" mrp="sf\os\shortlinksrv\irda\irdaconfig\infra-red_config.mrp"/>
+              <unit bldFile="os\shortlinksrv\irda\irdastack\group" mrp="os\shortlinksrv\irda\irdastack\group\infra-red_irda.mrp"/>
             </component>
           </collection>
           <collection name="Serial Comms Server Plugins" level="physical-abstraction">
@@ -1172,235 +1140,242 @@
               <!-- placeholder for ser-comms_serialportcsy, currently built by C32 -->
             </component>
             <component name="Bluetooth CSY" plugin="Y">
-              <unit bldFile="sf\os\shortlinksrv\bluetooth\btcomm" mrp="sf\os\shortlinksrv\bluetooth\btcomm\bluetooth_btcomm.mrp"/>
+              <unit bldFile="os\shortlinksrv\bluetooth\btcomm" mrp="os\shortlinksrv\bluetooth\btcomm\bluetooth_btcomm.mrp"/>
             </component>
-            <!-- PLACEHOLDER="DS.1577" START REMOVE -->
-			<component name="MUX CSY" introduced="9.4" plugin="Y">
-              <unit bldFile="sf\os\cellularsrv\telephonyreferenceplatform\trptsy\csy\csy27010\group" mrp="sf\os\cellularsrv\telephonyreferenceplatform\trptsy\csy\csy27010\group\telephony_muxcsy.mrp"/>
-            </component>
-			<!-- PLACEHOLDER="DS.1577" END REMOVE -->
           </collection>
         </subblock>
       </block>
       <block name="Multimedia" levels="device-fw devices middleware application-interface">
+		<collection name="Multimedia API Tests" level="application-interface">
+			<component name="Multimedia Verification Suite" class="placeholder" introduced="TB91">
+				<!-- PLACEHOLDER="DS.1603"
+				<unit mrp="os/mm/mmapitest/group/mmsvs.mrp"/>
+				-->
+				</component>
+		</collection>
         <collection name="Multimedia APIs and Frameworks" level="application-interface">
           <component name="Multimedia Framework" introduced="7.0s">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\mmfw\group" mrp="sf\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="Multimedia Utility Library">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\mmutilitylib\group" mrp="sf\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>
           <component name="Imaging Frameworks" introduced="7.0s">
-            <unit bldFile="sf\os\mm\imagingandcamerafws\imagingfws\group" mrp="sf\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="Camera Framework" introduced="7.0s">
-            <unit bldFile="sf\os\mm\imagingandcamerafws\camerafw\framework\group" mrp="sf\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>
-		  <!-- PLACEHOLDER="DS.1554" START REMOVE-->
-          <component name="Broadcast Radio Tuner" introduced="9.1" class="test">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\broadcastradiotuner\group" mrp="sf\mw\mmmw\mmmiddlewarefws\broadcastradiotuner\group\multimedia_tuner.mrp"/>
-          </component>
-		  <!-- PLACEHOLDER="DS.1554" END REMOVE-->
         </collection>
         <collection name="Multimedia Plugins" level="middleware">
           <component name="Multimedia Framework Plugins" plugin="Y" introduced="7.0s">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\mmfw\group_plugin" mrp="sf\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>
           <component name="Imaging Plugins" plugin="Y" introduced="7.0s">
-            <unit bldFile="sf\os\mm\imagingandcamerafws\imagingfws\plugins\group" mrp="sf\os\mm\imagingandcamerafws\imagingfws\plugins\group\multimedia_icl_plugin.mrp"/>
+            <unit bldFile="os\mm\imagingandcamerafws\imagingfws\plugins\group" mrp="os\mm\imagingandcamerafws\imagingfws\plugins\group\multimedia_icl_plugin.mrp"/>
           </component>
           <component name="Camera Plugins" plugin="Y" introduced="7.0s">
-            <unit bldFile="sf\os\mm\imagingandcamerafws\camerafw\plugins\group" mrp="sf\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="3GP Library" introduced="9.4">
-            <unit bldFile="sf\os\mm\mmplugins\3gplib\group" mrp="sf\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="3GP Unit Tests" introduced="tb92_or_future" class="test">
-            <unit mrp="sf\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="A3F Audio Component Library">
-            <unit bldFile="sf\os\mm\mmhais\a3facl\group" mrp="sf\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="A3F DevSound Customisation">
-            <unit bldFile="sf\os\mm\mmhais\a3fdevsoundcustomisation\group" mrp="sf\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>
         </collection>
         <collection name="Multimedia Resource Management" level="middleware">
           <component name="Multimedia Resource Controller">
-            <unit bldFile="sf\os\mm\mmresourcemgmt\mmresctrl\group" mrp="sf\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="Multimedia Device Framework" level="device-fw">
           <component name="Media Device Framework" introduced="9.2">
-            <unit bldFile="sf\os\mm\mmdevicefw\mdf\group" mrp="sf\os\mm\mmdevicefw\mdf\group\multimedia_mdf.mrp"/>
+            <unit bldFile="os\mm\mmdevicefw\mdf\group" mrp="os\mm\mmdevicefw\mdf\group\multimedia_mdf.mrp"/>
           </component>
           <component name="Speech Recognition Controller" introduced="7.0s">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\mmfw\ASR\group" mrp="sf\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>
           <component name="OpenMAX" introduced="9.4">
-            <unit bldFile="sf\os\mm\omxil\openmax\group" mrp="sf\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="Sound Device" level="devices">
           <component name="DevSound API">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_api" mrp="sf\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="A3F DevSound">
-            <unit bldFile="sf\os\mm\devsound\a3fdevsound\group" mrp="sf\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="A3F Audio Component Framework">
-            <unit bldFile="sf\os\mm\devsound\a3facf\group" mrp="sf\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="DevSound Plugin Support" introduced="7.0s">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_pluginsupport" mrp="sf\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="Reference DevSound Plugins" introduced="7.0s">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_refplugin" mrp="sf\mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_refplugin\multimedia_mdf_devsound_refplugin.mrp"/>
+            <unit bldFile="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_refplugin" mrp="mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_refplugin\multimedia_mdf_devsound_refplugin.mrp"/>
           </component>
           <component name="Bluetooth DevSound Plugin" plugin="Y" introduced="7.0s">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\mmfw\sounddevbt\group" mrp="sf\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="A3F Trace Utility">
-            <unit bldFile="sf\os\mm\devsound\a3ftrace\group" mrp="sf\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="A3F Server Start" plugin="Y" introduced="9.5">
-            <unit bldFile="sf\os\mm\devsound\a3fsrvstart\group" mrp="sf\os\mm\devsound\a3fsrvstart\group\multimedia_a3f_serverstart.mrp"/>
+            <unit bldFile="os\mm\devsound\a3fsrvstart\group" mrp="os\mm\devsound\a3fsrvstart\group\multimedia_a3f_serverstart.mrp"/>
           </component>
         </collection>
         <collection name="Multimedia Hardware Adaptation Interfaces" level="device-fw">
           <component name="DevSound Hardware Device API" introduced="7.0s">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\mmfw\SoundDev\group_hwdev" mrp="sf\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="Reference ACL Adaptation">
-            <unit bldFile="sf\os\mm\mmhais\refacladapt\group" mrp="sf\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="Video HAI" introduced="7.0s">
-            <unit bldFile="sf\mw\mmmw\mmmiddlewarefws\mmfw\DevVideo\group" mrp="sf\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>
           <component name="Mobile TV DVB-H Receiver HAI" introduced="9.5">
-            <unit bldFile="sf\os\mm\mmhais\dvbhreceiverhai\hai\dvbh\group" mrp="sf\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>
         </collection>
       </block>
       <block name="Graphics" levels="engines internal-adaptations device-interface internal-utils application-interface">
+		<collection name="Graphics API Tests" level="application-interface">
+		<component name="Graphics Verification Suite" class="placeholder" introduced="TB91">
+			<!-- PLACEHOLDER="DS.1603"
+			<unit mrp="os/graphics/graphcisapitest/group/graphicssvs.mrp"/>
+			-->
+		</component>
+		</collection>
         <collection name="Windowing Framework" level="application-interface">
           <component name="Window Server">
-            <unit bldFile="sf\os\graphics\windowing\windowserver\group" mrp="sf\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="Printing Services" level="application-interface">
           <component name="Printer Driver Support">
-            <unit bldFile="sf\os\graphics\printingservices\printerdriversupport\group" mrp="sf\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="Printer Drivers" plugin="Y">
-            <unit bldFile="sf\os\graphics\printingservices\printerdrivers\group" mrp="sf\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="Fonts Services" level="internal-utils">
           <component name="Text Shaper Plugin" plugin="Y" introduced="9.2">
-            <unit bldFile="sf\os\textandloc\fontservices\textshaperplugin\group" mrp="sf\os\textandloc\fontservices\textshaperplugin\group\graphics_iculayoutengine.mrp"/>
+            <unit bldFile="os\textandloc\fontservices\textshaperplugin\group" mrp="os\textandloc\fontservices\textshaperplugin\group\graphics_iculayoutengine.mrp"/>
           </component>
           <component name="Font and Bitmap Server">
-            <unit bldFile="sf\os\graphics\fbs\fontandbitmapserver\group" mrp="sf\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="Font Store">
-            <unit bldFile="sf\os\textandloc\fontservices\fontstore\group" mrp="sf\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="FreeType Font Rasteriser" plugin="Y">
-            <unit bldFile="sf\os\textandloc\fontservices\freetypefontrasteriser\group" mrp="sf\os\textandloc\fontservices\freetypefontrasteriser\group\graphics_freetype.mrp"/>
+            <unit bldFile="os\textandloc\fontservices\freetypefontrasteriser\group" mrp="os\textandloc\fontservices\freetypefontrasteriser\group\graphics_freetype.mrp"/>
           </component>
           <component name="iType Font Rasteriser" contract="Monotype_iType_Rasteriser" filter="gt" plugin="Y" introduced="9.5">
-            <unit bldFile="sf\os\graphics\fbs\itypefontrasteriser\group" mrp="sf\os\graphics\fbs\itypefontrasteriser\group\graphics_itype.mrp"/>
+            <unit bldFile="os\graphics\fbs\itypefontrasteriser\group" mrp="os\graphics\fbs\itypefontrasteriser\group\graphics_itype.mrp"/>
           </component>
           <component name="Reference Fonts">
-            <unit bldFile="sf\os\textandloc\fontservices\referencefonts\group" mrp="sf\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="Graphics Test Fonts" filter="gt">
+            <unit bldFile="os\textandloc\fontservices\graphicstestfonts\group" mrp="os\textandloc\fontservices\graphicstestfonts\group\graphics_testfonts.mrp"/>
           </component>
         </collection>
         <collection name="Khronos APIs" level="device-interface">
           <component name="OpenGL ES Framework" introduced="8.0">
-            <unit bldFile="sf\os\graphics\opengles\openglesdisplayproperties\group" mrp="sf\os\graphics\opengles\openglesdisplayproperties\group\graphics_openglesdisplayproperty.mrp"/>
+            <unit bldFile="os\graphics\opengles\openglesdisplayproperties\group" mrp="os\graphics\opengles\openglesdisplayproperties\group\graphics_openglesdisplayproperty.mrp"/>
           </component>
           <component name="OpenGL ES API" introduced="8.0">
-            <unit bldFile="sf\os\graphics\opengles\openglesinterface\group" mrp="sf\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>
           <component name="OpenVG API" contract="Symbian_Exclude" introduced="9.5">
-            <unit bldFile="sf\os\graphics\openvg\openvginterface\group" mrp="sf\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>
           <component name="EGL API" contract="Symbian_Exclude" introduced="9.4">
-            <unit bldFile="sf\os\graphics\egl\eglinterface\group" mrp="sf\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="Khronos Implementation" level="internal-adaptations">
           <component name="OpenGL ES Implementation" contract="OPENGL" filter="gt" introduced="8.0">
-            <unit bldFile="sf\os\graphics\opengles\openglesimplementation\group\" mrp="sf\os\graphics\opengles\openglesimplementation\group\graphics_opengles.mrp"/>
+            <unit bldFile="os\graphics\opengles\openglesimplementation\group\" mrp="os\graphics\opengles\openglesimplementation\group\graphics_opengles.mrp"/>
           </component>
           <component name="EGL Implementation" contract="Symbian_Exclude" introduced="9.4">
-            <unit bldFile="sf\os\graphics\egl\eglimplementation\group\" mrp="sf\os\graphics\egl\eglimplementation\group\graphics_egl.mrp"/>
+            <unit bldFile="os\graphics\egl\eglimplementation\group\" mrp="os\graphics\egl\eglimplementation\group\graphics_egl.mrp"/>
           </component>
         </collection>
         <collection name="Graphics Device Interface" level="device-interface">
           <component name="Bit GDI">
-            <unit bldFile="sf\os\graphics\graphicsdeviceinterface\bitgdi\group" mrp="sf\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="GDI">
-            <unit bldFile="sf\os\textandloc\graphicsdevif\gdi\group" mrp="sf\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>
           <component name="Colour Palette" introduced="7.0s">
-            <unit bldFile="sf\os\graphics\graphicsdeviceinterface\colourpalette\group" mrp="sf\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>
         </collection>
       </block>
       <block name="Location Based Services" levels="data-acquisition adaptation management application-interface">
         <collection name="Location Request Management" level="application-interface">
           <component name="Location Server" contract="LBS" introduced="9.2">
-            <unit bldFile="sf\os\lbs\locationrequestmgmt\locationserver\group" mrp="sf\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="Network Request Handler" contract="LBS" introduced="9.2">
-            <unit bldFile="sf\os\lbs\locationrequestmgmt\networkrequesthandler\group" mrp="sf\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="Location Management" level="management">
           <component name="A-GPS Location Manager" contract="LBS" introduced="9.2">
-            <unit bldFile="sf\os\lbs\locationmgmt\agpslocationmgr\group" mrp="sf\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="Network Location Manager" contract="LBS" introduced="9.2">
-            <unit bldFile="sf\os\lbs\locationmgmt\networklocationmgr\group" mrp="sf\os\lbs\locationmgmt\networklocationmgr\group\lbs_networklocationmanager.mrp"/>
+            <unit bldFile="os\lbs\locationmgmt\networklocationmgr\group" mrp="os\lbs\locationmgmt\networklocationmgr\group\lbs_networklocationmanager.mrp"/>
           </component>
           <component name="Location Admin" contract="LBS" introduced="9.2">
-            <unit bldFile="sf\os\lbs\locationmgmt\locationadmin\group" mrp="sf\os\lbs\locationmgmt\locationadmin\group\lbs_admin.mrp"/>
+            <unit bldFile="os\lbs\locationmgmt\locationcore\group" mrp="os\lbs\locationmgmt\locationcore\group\lbs_admin.mrp"/>
           </component>
           <component name="Network Gateway" contract="LBS" introduced="9.2">
-            <unit bldFile="sf\os\lbs\locationmgmt\networkgateway\group" mrp="sf\os\lbs\locationmgmt\networkgateway\group\lbs_networkgateway.mrp"/>
+            <unit bldFile="os\lbs\locationmgmt\networkgateway\group" mrp="os\lbs\locationmgmt\networkgateway\group\lbs_networkgateway.mrp"/>
           </component>
         </collection>
         <collection name="Network Adaptation" level="adaptation">
           <component name="Network Protocol Module" plugin="Y" introduced="9.2">
-            <unit bldFile="sf\os\lbs\networkprotocolmodules\networkprotocolmodule\group" mrp="sf\os\lbs\networkprotocolmodules\networkprotocolmodule\group\lbs_networktest.mrp"/>
+            <unit bldFile="os\lbs\lbstest\locationprotocoltest\group" mrp="os\lbs\lbstest\locationprotocoltest\group\lbs_networktest.mrp"/>
           </component>
           <component name="Privacy Protocol Module" plugin="Y" introduced="9.4">
-            <unit bldFile="sf\os\lbs\networkprotocolmodules\privacyprotocolmodule\group" mrp="sf\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="SUPL Protocol Module" plugin="Y" introduced="9.4">
-		  <unit bldFile="sf\os\lbs\networkprotocolmodules\suplprotocolmodule\group" mrp="sf\os\lbs\networkprotocolmodules\suplprotocolmodule\group\lbs_suplprotocolmodule.mrp"/>
+		  <unit bldFile="os\lbs\networkprotocolmodules\suplprotocolmodule\group" mrp="os\lbs\networkprotocolmodules\suplprotocolmodule\group\lbs_suplprotocolmodule.mrp"/>
 			</component>
         </collection>
         <collection name="Data Source Modules" level="data-acquisition">
           <component name="Default Positioning Module" plugin="Y" introduced="9.4">
-            <unit bldFile="sf\os\lbs\datasourcemodules\defaultpositioningmodule\group" mrp="sf\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="Bluetooth GPS Positioning Module" plugin="Y" introduced="9.4">
-            <unit bldFile="sf\os\lbs\datasourcemodules\bluetoothgpspositioningmodule\group" mrp="sf\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="Simulation Positioning Module" plugin="Y" introduced="9.4">
-            <unit bldFile="sf\os\lbs\datasourcemodules\simulationpositioningmodule\group" mrp="sf\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>
 		 </collection>
         <collection name="Data Source Adaptation" level="adaptation">
           <component name="A-GPS Integration Module" plugin="Y" introduced="9.2">
-            <unit bldFile="sf\os\lbs\datasourcemodules\agpsintegrationmodule\group" mrp="sf\os\lbs\datasourcemodules\agpsintegrationmodule\group\lbs_datasourceplugins.mrp"/>
+            <unit bldFile="os\lbs\datasourcemodules\agpsintegrationmodule\group" mrp="os\lbs\datasourcemodules\agpsintegrationmodule\group\lbs_datasourceplugins.mrp"/>
           </component>
           <component name="GPS Data Source Adaptation" plugin="Y" introduced="9.4">
-            <unit bldFile="sf\os\lbs\datasourceadaptation\gpsdatasourceadaptation\group" mrp="sf\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>
       </block>
@@ -1409,225 +1384,230 @@
       <block name="Generic Application Support">
         <collection name="File Handling" level="specific">
           <component name="File Converter Framework">
-            <unit bldFile="sf\mw\appsupport\filehandling\fileconverterfw\group" mrp="sf\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="Other File Converter Plugins" plugin="Y" introduced="5.0" deprecated="9.3">
-            <unit bldFile="sf\mw\appsupport\filehandling\fileconverterplugins\group" mrp="sf\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="HTML to RichText Converter" plugin="Y" introduced="7.0">
-            <unit bldFile="sf\mw\appsupport\filehandling\htmltorichtextconverter\group" mrp="sf\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="RichText to HTML Converter" plugin="Y" introduced="7.0s">
-            <unit bldFile="sf\mw\appsupport\filehandling\richtexttohtmlconverter\Group" mrp="sf\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="Text Rendering" level="generic">
           <component name="Text Handling">
-            <unit bldFile="sf\os\textandloc\textrendering\texthandling\group" mrp="sf\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="Text Formatting">
-            <unit bldFile="sf\os\textandloc\textrendering\textformatting\group" mrp="sf\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>
         </collection>
         <collection name="Common Application Services" level="generic">
           <component name="Alarm Server" introduced="7.0">
-            <unit bldFile="sf\mw\appsupport\commonappservices\alarmserver\Group" mrp="sf\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="Help" introduced="6.0">
-            <unit bldFile="sf\app\helps\symhelp\helpmodel\group" mrp="sf\app\helps\symhelp\helpmodel\group\app-services_hlpmodel.mrp"/>
+            <unit bldFile="app\helps\symhelp\helpmodel\group" mrp="app\helps\symhelp\helpmodel\group\app-services_hlpmodel.mrp"/>
           </component>
         </collection>
         <collection name="Time Zone Services" level="generic">
           <component name="Time Zone Server" introduced="9.1">
-            <unit bldFile="sf\mw\appsupport\tzservices\tzserver\group" mrp="sf\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="Time Zone Localization" introduced="9.1">
-            <unit bldFile="sf\mw\appsupport\tzservices\tzlocalization\group" mrp="sf\mw\appsupport\tzservices\tzlocalization\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="World Server" introduced="7.0" deprecated="9.1">
-            <unit bldFile="sf\mw\appsupport\tzservices\worldserver\group" mrp="sf\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>
         </collection>
         <collection name="Content Handling" level="specific">
           <component name="Content Handling Framework" introduced="8.0">
-            <unit bldFile="sf\mw\appsupport\contenthandling\contenthandlingfw\Group" mrp="sf\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="SMIL Parser" introduced="7.0s">
-            <unit bldFile="sf\app\messaging\messagingappbase\smilparser\GROUP" mrp="sf\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="Web Recognisers" plugin="Y">
-            <unit bldFile="sf\mw\appsupport\contenthandling\webrecognisers\group" mrp="sf\mw\appsupport\contenthandling\webrecognisers\group\application-protocols_recognisers.mrp"/>
+            <unit bldFile="mw\appsupport\contenthandling\webrecognisers\group" mrp="mw\appsupport\contenthandling\webrecognisers\group\application-protocols_recognisers.mrp"/>
           </component>
           <component name="Reference DRM Agent" introduced="8.0">
-            <unit bldFile="sf\mw\appsupport\contenthandling\referencedrmagent\RefTestAgent\group" mrp="sf\mw\appsupport\contenthandling\referencedrmagent\RefTestAgent\group\security_rta.mrp"/>
+            <unit bldFile="mw\appsupport\contenthandling\referencedrmagent\RefTestAgent\group" mrp="mw\appsupport\contenthandling\referencedrmagent\RefTestAgent\group\security_rta.mrp"/>
           </component>
         </collection>
         <collection name="Printing Support" level="specific">
           <component name="Printing UI Support">
-            <unit bldFile="sf\mw\appsupport\printingsupport\printinguisupport\group" mrp="sf\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="Hardware Resource Adaptation">
+					<component name="Hardware Resource Manager UI Plugin" introduced="tb91">
+						<unit bldFile="mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin\group" mrp="mw\appsupport\hwresourceadaptation\hwresourcemgruiplugin\group\telephony_hwrmuiplugin.mrp"/>
+					</component>
+				</collection>
         <collection name="Backup and Restore" level="generic">
           <component name="Backup Engine" introduced="9.0">
-            <unit bldFile="sf\mw\remoteconn\backup\backupengine\group" mrp="sf\mw\remoteconn\backup\backupengine\group\connectivity_backupengine.mrp"/>
+            <unit bldFile="mw\remoteconn\backupandrestore\backupengine\group" mrp="mw\remoteconn\backupandrestore\backupengine\group\connectivity_backupengine.mrp"/>
           </component>
         </collection>
       </block>
       <block name="Security Management">
         <collection name="Installation Services" level="specific">
           <component name="Secure Software Install">
-            <unit bldFile="sf\mw\appinstall\installationservices\swi\group" mrp="sf\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="Secure Software Install Device Tools" introduced="8.1">
-            <unit bldFile="sf\mw\appinstall\installationservices\swidevicetools\group" mrp="sf\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="Software Install Test Framework">
+			<unit bldFile="mw\appinstall\installationservices\switestfw\group" mrp="mw\appinstall\installationservices\switestfw\group\install_testframework.mrp"/>
+          </component>
+		<component name="Software Install Config">
+			<unit bldFile="mw\appinstall\installationservices\swiconfig\group" mrp="mw\appinstall\installationservices\swiconfig\group\install_config.mrp"/>
           </component>
         </collection>
         <collection name="Crypto Services" level="generic">
           <component name="Certificate and Key Management" introduced="6.0">
-            <unit bldFile="sf\os\security\cryptoservices\certificateandkeymgmt\group" mrp="sf\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="Root Certificates" introduced="7.0s">
-            <unit mrp="sf\os\security\cryptoservices\rootcertificates\rootcerts.mrp"/>
+            <unit mrp="os\security\cryptoservices\rootcertificates\rootcerts.mrp"/>
           </component>
           <component name="ASN PKCS" introduced="8.0">
-            <unit bldFile="sf\os\security\cryptoservices\asnpkcs\group" mrp="sf\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>
         </collection>
         <collection name="Network Security" level="generic">
-          <component name="EAP Plugins for WiFi" class="placeholder">
-            <!-- WiFi's Extensible Authentication Protocol plugins that rely on TLS -->
-          </component>
           <component name="TLS" introduced="6.0">
-            <unit bldFile="sf\os\networkingsrv\networksecurity\tls\group" mrp="sf\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="TLS Provider" introduced="8.1">
-            <unit bldFile="sf\os\networkingsrv\networksecurity\tlsprovider\group" mrp="sf\os\networkingsrv\networksecurity\tlsprovider\group\security_tlsprovider.mrp"/>
+            <unit bldFile="os\networkingsrv\networksecurity\tlsprovider\group" mrp="os\networkingsrv\networksecurity\tlsprovider\group\security_tlsprovider.mrp"/>
           </component>
           <component name="IPsec" contract="IPSec_Protocol_Stack" introduced="7.0">
-            <unit bldFile="sf\os\networkingsrv\networksecurity\ipsec\group" mrp="sf\os\networkingsrv\networksecurity\ipsec\group\networking_ipsec.mrp"/>
+            <unit bldFile="os\networkingsrv\networksecurity\ipsec\group" mrp="os\networkingsrv\networksecurity\ipsec\group\networking_ipsec.mrp"/>
           </component>
         </collection>
       </block>
       <block name="Application Protocols">
         <collection name="Application Layer Protocols" level="specific">
           <component name="HTTP Transport Framework" introduced="6.2">
-            <unit bldFile="sf\mw\netprotocols\applayerprotocols\httptransportfw\group" mrp="sf\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="HTTP Examples" introduced="6.2">
-            <unit bldFile="sf\mw\netprotocols\applayerprotocols\httpexamples\group" mrp="sf\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="WAP Push Framework" introduced="6.1">
-            <unit bldFile="sf\mw\messagingmw\messagingfw\wappushfw\group" mrp="sf\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="SUPL SMS Handler" plugin="Y" introduced="9.4">
-			<unit bldFile="sf\mw\messagingmw\messagingfw\suplsmshandler\group" mrp="sf\mw\messagingmw\messagingfw\suplsmshandler\group\lbs_suplsmstrigger.mrp"/>
+			<unit bldFile="mw\messagingmw\messagingfw\suplsmshandler\group" mrp="mw\messagingmw\messagingfw\suplsmshandler\group\lbs_suplsmstrigger.mrp"/>
 		  </component>
 		  <component name="SUPL WAP Push Handler" plugin="Y" introduced="9.4">
-			<unit bldFile="sf\mw\messagingmw\messagingfw\suplwappushhandler\group" mrp="sf\mw\messagingmw\messagingfw\suplwappushhandler\group\lbs_suplwappush.mrp"/>
+			<unit bldFile="mw\messagingmw\messagingfw\suplwappushhandler\group" mrp="mw\messagingmw\messagingfw\suplwappushhandler\group\lbs_suplwappush.mrp"/>
 		  </component>
           <component name="WAP Push Support" introduced="6.2">
-            <unit bldFile="sf\mw\netprotocols\applayerprotocols\wappushsupport\Group" mrp="sf\mw\netprotocols\applayerprotocols\wappushsupport\Group\wap-browser_wappushsupport.mrp"/>
+            <unit bldFile="mw\netprotocols\applayerprotocols\wappushsupport\Group" mrp="mw\netprotocols\applayerprotocols\wappushsupport\Group\wap-browser_wappushsupport.mrp"/>
           </component>
           <component name="WAP Base" introduced="6.0">
-            <unit bldFile="sf\mw\netprotocols\applayerprotocols\wapbase\Group" mrp="sf\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="FTP Engine" introduced="6.0">
-            <unit bldFile="sf\mw\netprotocols\applayerprotocols\ftpengine\group" mrp="sf\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="Telnet Engine" introduced="6.0">
-            <unit bldFile="sf\mw\netprotocols\applayerprotocols\telnetengine\group" mrp="sf\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="OBEX Protocol" introduced="9.1">
-            <unit bldFile="sf\mw\shortlinkconn\obex\obexprotocol\group" mrp="sf\mw\shortlinkconn\obex\obexprotocol\group\obex.mrp"/>
+            <unit bldFile="mw\shortlinkconn\obex\obexprotocol\group" mrp="mw\shortlinkconn\obex\obexprotocol\group\obex.mrp"/>
           </component>
           <component name="OBEX Extension API" introduced="9.2">
-            <unit bldFile="sf\mw\shortlinkconn\obex\obexextensionapi\group" mrp="sf\mw\shortlinkconn\obex\obexextensionapi\group\obex_extensionapis.mrp"/>
+            <unit bldFile="mw\shortlinkconn\obex\obexextensionapi\group" mrp="mw\shortlinkconn\obex\obexextensionapi\group\obex_extensionapis.mrp"/>
           </component>
         </collection>
         <collection name="Application Layer Plugins and Utils" level="specific">
           <component name="HTTP Utilities Library" introduced="6.2">
-            <unit bldFile="sf\os\ossrv\genericservices\httputils\group" mrp="sf\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="URI Permission Services" introduced="9.4">
-            <unit bldFile="sf\mw\netprotocols\applayerpluginsandutils\uripermissionservices\group" mrp="sf\mw\netprotocols\applayerpluginsandutils\uripermissionservices\group\application-protocols_ineturilist.mrp"/>
+            <unit bldFile="mw\netprotocols\applayerpluginsandutils\uripermissionservices\group" mrp="mw\netprotocols\applayerpluginsandutils\uripermissionservices\group\application-protocols_ineturilist.mrp"/>
           </component>
           <component name="Bookmark Support" introduced="9.1">
-            <unit bldFile="sf\mw\netprotocols\applayerpluginsandutils\bookmarksupport\group" mrp="sf\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="HTTP Protocol Plugins" plugin="Y" introduced="6.2">
-            <unit bldFile="sf\mw\netprotocols\applayerpluginsandutils\httpprotocolplugins\group" mrp="sf\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="HTTP Transport Plugins" plugin="Y" introduced="6.2">
-            <unit bldFile="sf\mw\netprotocols\applayerpluginsandutils\httptransportplugins\group" mrp="sf\mw\netprotocols\applayerpluginsandutils\httptransportplugins\group\http_transport-plugin.mrp"/>
+            <unit bldFile="mw\netprotocols\applayerpluginsandutils\httptransportplugins\group" mrp="mw\netprotocols\applayerpluginsandutils\httptransportplugins\group\http_transport-plugin.mrp"/>
           </component>
         </collection>
         <collection name="Bluetooth Profiles" level="specific">
           <component name="Bluetooth AVRCP">
-            <unit bldFile="sf\mw\shortlinkconn\bluetoothappprofiles\avrcp" mrp="sf\mw\shortlinkconn\bluetoothappprofiles\avrcp\bluetooth_avrcp.mrp"/>
+            <unit bldFile="mw\shortlinkconn\bluetoothappprofiles\avrcp" mrp="mw\shortlinkconn\bluetoothappprofiles\avrcp\bluetooth_avrcp.mrp"/>
           </component>
           <component name="Bluetooth PBAP" introduced="9.2">
-            <unit bldFile="sf\app\contacts\pimprotocols\pbap\group" mrp="sf\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="Bluetooth PAN Profile" plugin="Y" introduced="8.1">
-            <unit bldFile="sf\os\shortlinksrv\bluetoothcommsprofiles\btpan\group" mrp="sf\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="WAP Stack" level="generic">
           <component name="WAP Message API">
-            <unit bldFile="sf\mw\netprotocols\wapstack\wapmessageapi\group" mrp="sf\mw\netprotocols\wapstack\wapmessageapi\group\wap-stack_wapmessage.mrp"/>
-          </component>
-          <component name="WAP Short Stack" contract="Symbian_Affiliate" filter="gt" introduced="8.0">
-            <unit bldFile="sf\mw\netprotocols\wapstack\wapshortstack\wapstack\group" mrp="sf\mw\netprotocols\wapstack\wapshortstack\wapstack\group\wap-stack_wapstack.mrp"/>
+            <unit bldFile="mw\netprotocols\wapstack\wapmessageapi\group" mrp="mw\netprotocols\wapstack\wapmessageapi\group\wap-stack_wapmessage.mrp"/>
           </component>
         </collection>
         <collection name="Connectivity Transports" level="generic">
           <component name="m-Router" contract="MRouter" filter="gt">
-            <unit bldFile="sf\mw\remoteconn\connectivitytransports\mrouter\group" mrp="sf\mw\remoteconn\connectivitytransports\mrouter\group\connectivity_mRouterSecure.mrp"/>
+            <unit bldFile="mw\remoteconn\connectivitytransports\mrouter\group" mrp="mw\remoteconn\connectivitytransports\mrouter\group\connectivity_mRouterSecure.mrp"/>
           </component>
           <component name="PLP Remote Link" deprecated="9.0">
-            <unit bldFile="sf\mw\remoteconn\connectivitytransports\plpremotelink\plpgrp" mrp="sf\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="PLP Variant" deprecated="9.0">
-            <unit bldFile="sf\mw\remoteconn\connectivitytransports\plpremotelink\plpvariant" mrp="sf\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="Event Broadcast" deprecated="9.0">
-            <unit bldFile="sf\mw\remoteconn\connectivitytransports\eventbroadcast\group" mrp="sf\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>
         </collection>
         <collection name="MTP Transports" level="generic">
           <component name="MTP USB Transport" plugin="Y" introduced="9.4">
-            <unit bldFile="sf\mw\remoteconn\mtptransfw\mtpusbtransport\group" mrp="sf\mw\remoteconn\mtptransfw\mtpusbtransport\group\mtp_usbsic.mrp"/>
+            <unit bldFile="mw\remoteconn\mtptransports\mtpusbtransport\group" mrp="mw\remoteconn\mtptransports\mtpusbtransport\group\mtp_usbsic.mrp"/>
           </component>
         </collection>
       </block>
       <block name="Multimedia Middleware" levels="protocols plugins">
         <collection name="Multimedia Protocols" level="protocols">
           <component name="MTP Framework" introduced="9.4">
-            <unit bldFile="sf\mw\remoteconn\mtptransfw\mtpfw\group" mrp="sf\mw\remoteconn\mtptransfw\mtpfw\group\mtp_framework.mrp"/>
+            <unit bldFile="mw\remoteconn\mtpfws\mtpfw\group" mrp="mw\remoteconn\mtpfws\mtpfw\group\mtp_framework.mrp"/>
           </component>
           <component name="RTP" introduced="9.0">
             <!-- Real Time Data Protocol -->
-            <unit bldFile="sf\mw\ipappprotocols\realtimenetprots\rtp\group" mrp="sf\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="SIP Framework" contract="SIP_Stack" introduced="9.2" filter="gt">
-            <unit version="2" bldFile="sf\mw\ipappprotocols\realtimenetprots\sipfw\Group" mrp="sf\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="SIP Connection Provider Plugins" level="plugins">
           <component name="SIP Connection Provider" plugin="Y" introduced="9.2" filter="gt">
-            <unit bldFile="sf\mw\ipappprotocols\sipconnproviderplugins\sipconnprovider\group" mrp="sf\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="SIP Dummy PRT" plugin="Y" introduced="9.2" filter="gt">
-            <unit bldFile="sf\mw\ipappprotocols\sipconnproviderplugins\sipdummyprt\group" mrp="sf\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="SIP State Machine" introduced="9.2" filter="gt">
-            <unit bldFile="sf\mw\ipappprotocols\sipconnproviderplugins\sipstatemachine\group" mrp="sf\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="SIP Params" plugin="Y" introduced="9.2" filter="gt">
-            <unit bldFile="sf\mw\ipappprotocols\sipconnproviderplugins\sipparams\group" mrp="sf\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="SIP Subconnection Provider" plugin="Y" introduced="9.2" filter="gt">
-            <unit bldFile="sf\mw\ipappprotocols\sipconnproviderplugins\sipsubconnprovider\group" mrp="sf\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>
       </block>
@@ -1635,52 +1615,52 @@
         <subblock name="GUI Provisioning">
           <collection name="Common UI Support" level="presentation">
             <component name="UIKON" introduced="6.0">
-              <unit bldFile="sf\mw\classicui\commonuisupport\uikon\group" mrp="sf\mw\classicui\commonuisupport\uikon\group\app-framework_uikon.mrp"/>
+              <unit bldFile="mw\classicui\commonuisupport\uikon\group" mrp="mw\classicui\commonuisupport\uikon\group\app-framework_uikon.mrp"/>
             </component>
             <component name="Error Resolver Data">
-              <unit bldFile="sf\mw\classicui\commonuisupport\errorresolverdata\group" mrp="sf\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="UI Look and Feel" introduced="6.0">
-              <unit bldFile="sf\mw\classicui\commonuisupport\uilaf\GROUP" mrp="sf\mw\classicui\commonuisupport\uilaf\GROUP\app-framework_uiklafgt.mrp"/>
+              <unit bldFile="mw\classicui\commonuisupport\uilaf\GROUP" mrp="mw\classicui\commonuisupport\uilaf\GROUP\app-framework_uiklafgt.mrp"/>
             </component>
             <component name="Grid">
-              <unit bldFile="sf\mw\classicui\commonuisupport\grid\group" mrp="sf\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>
           </collection>
           <collection name="Look-and-Feel Agnostic UI Foundation" level="structure">
             <component name="Control Environment">
-              <unit bldFile="sf\mw\classicui\lafagnosticuifoundation\cone\group" mrp="sf\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="Front End Processor">
-              <unit bldFile="sf\mw\inputmethods\fep\frontendprocessor\group" mrp="sf\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="Graphics Effects" introduced="9.2">
-              <unit bldFile="sf\mw\classicui\lafagnosticuifoundation\graphicseffects\group" mrp="sf\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="UI Graphics Utilities">
-              <unit bldFile="sf\mw\classicui\lafagnosticuifoundation\uigraphicsutils\group" mrp="sf\mw\classicui\lafagnosticuifoundation\uigraphicsutils\group\app-framework_egul.mrp"/>
+              <unit bldFile="mw\classicui\lafagnosticuifoundation\uigraphicsutils\group" mrp="mw\classicui\lafagnosticuifoundation\uigraphicsutils\group\app-framework_egul.mrp"/>
             </component>
             <component name="Number Formatting" introduced="7.0s">
-              <unit bldFile="sf\os\textandloc\textrendering\numberformatting\group" mrp="sf\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="Clock" plugin="Y">
-              <unit bldFile="sf\mw\classicui\lafagnosticuifoundation\clockanim\group" mrp="sf\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="BMP Animation" introduced="6.0">
-              <unit bldFile="sf\mw\classicui\lafagnosticuifoundation\bmpanimation\group" mrp="sf\mw\classicui\lafagnosticuifoundation\bmpanimation\group\app-framework_bmpanim.mrp"/>
+              <unit bldFile="mw\classicui\lafagnosticuifoundation\bmpanimation\group" mrp="mw\classicui\lafagnosticuifoundation\bmpanimation\group\app-framework_bmpanim.mrp"/>
             </component>
             <component name="Animation" introduced="9.1">
-              <unit bldFile="sf\mw\classicui\lafagnosticuifoundation\animation\group" mrp="sf\mw\classicui\lafagnosticuifoundation\animation\group\app-framework_animation.mrp"/>
+              <unit bldFile="mw\classicui\lafagnosticuifoundation\animation\group" mrp="mw\classicui\lafagnosticuifoundation\animation\group\app-framework_animation.mrp"/>
             </component>
           </collection>
         </subblock>
         <subblock name="Application Provisioning">
           <collection name="Application Framework" level="structure">
             <component name="Application Architecture">
-              <unit bldFile="sf\mw\appsupport\appfw\apparchitecture\group" mrp="sf\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="View Server" introduced="6.0">
-              <unit bldFile="sf\mw\appsupport\appfw\viewserver\group" mrp="sf\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>
         </subblock>
@@ -1690,144 +1670,147 @@
       <block name="PIM" levels="utilities engines">
         <collection name="PIM App Services" level="engines">
           <component name="Calendar" introduced="9.5">
-            <unit version="2" bldFile="sf\app\organizer\pimappservices\calendar\group" mrp="sf\app\organizer\pimappservices\calendar\group\app-engines_calendar.mrp"/>
+            <unit version="2" bldFile="app\organizer\pimappservices\calendar\group" mrp="app\organizer\pimappservices\calendar\group\app-engines_calendar.mrp"/>
           </component>
           <component name="Agenda Versit Plugin" plugin="Y" introduced="9.5">
-            <unit version="2" bldFile="sf\app\organizer\pimappservices\calendarvcalplugin\group" mrp="sf\app\organizer\pimappservices\calendarvcalplugin\group\app-engines_agnversit2.mrp"/>
+            <unit version="2" bldFile="app\organizer\pimappservices\calendarvcalplugin\group" mrp="app\organizer\pimappservices\calendarvcalplugin\group\app-engines_agnversit2.mrp"/>
           </component>
           <component name="Contacts Model" introduced="5.0">
-            <unit version="1" bldFile="sf\app\contacts\phonebookengines\contactsmodel\group" mrp="sf\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="Phonebook Sync" plugin="Y">
-            <unit bldFile="sf\app\contacts\pimprotocols\phonebooksync\group" mrp="sf\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="PIM Application Support" level="utilities">
           <component name="vCard and vCal" introduced="5.0">
-            <unit bldFile="sf\app\organizer\pimappsupport\vcardandvcal\group" mrp="sf\app\organizer\pimappsupport\vcardandvcal\group\app-services_versit.mrp"/>
+            <unit bldFile="app\organizer\pimappsupport\vcardandvcal\group" mrp="app\organizer\pimappsupport\vcardandvcal\group\app-services_versit.mrp"/>
           </component>
           <component name="Chinese Calendar Converter" introduced="6.1">
-            <unit bldFile="sf\app\organizer\pimappsupport\chinesecalendarconverter\group" mrp="sf\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="Chinese Calendar Algorithm" introduced="tb91">
+            <unit bldFile="app\organizer\pimappsupport\chinesecalendaralg\group" mrp="app\organizer\pimappsupport\chinesecalendaralg\group\app-services_chinesecalendaralgorithm.mrp"/>
           </component>
           <component name="Backup Restore Notification" introduced="8.1">
-            <unit bldFile="sf\mw\appsupport\commonappservices\backuprestorenotification\group" mrp="sf\mw\appsupport\commonappservices\backuprestorenotification\group\app-services_BackupRestoreNotification.mrp"/>
+            <unit bldFile="mw\appsupport\commonappservices\backuprestorenotification\group" mrp="mw\appsupport\commonappservices\backuprestorenotification\group\app-services_BackupRestoreNotification.mrp"/>
           </component>
         </collection>
         <collection name="Office App Engines" level="engines">
           <component name="Data Engine" introduced="5.0" deprecated="9.3">
-            <unit bldFile="sf\app\organizer\officeappeng\datamodel\group" mrp="sf\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="Sheet Engine" introduced="5.0" deprecated="9.3">
-            <unit bldFile="sf\app\organizer\officeappeng\sheeteng\group" mrp="sf\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="Chart" introduced="5.0" deprecated="9.3" class="test">
-            <unit mrp="sf\app\organizer\officeappeng\charteng\group\app-engines_chart.mrp"/>
+            <unit mrp="app\organizer\officeappeng\charteng\group\app-engines_chart.mrp"/>
           </component>
           <component name="Word Engine" introduced="5.0" deprecated="9.3">
-            <unit bldFile="sf\app\organizer\officeappeng\wordeng\group" mrp="sf\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>
       </block>
       <block name="Messaging" levels="plugins framework">
         <collection name="Messaging Framework" level="framework">
           <component name="Message Server and Store">
-            <unit bldFile="sf\mw\messagingmw\messagingfw\msgsrvnstore\group" mrp="sf\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="BIO Messaging Framework" introduced="6.0">
-            <unit bldFile="sf\mw\messagingmw\messagingfw\biomsgfw\group" mrp="sf\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="MMS Settings" introduced="9.2">
-            <unit bldFile="sf\app\messaging\mmsengine\mmssettings\group\" mrp="sf\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="MMS Configuration">
-            <unit mrp="sf\app\messaging\mmsengine\mmssettings\group\messaging_mmssettings-config.mrp"/>
+            <unit mrp="app\messaging\mmsengine\mmssettings\group\messaging_mmssettings-config.mrp"/>
           </component>
           <component name="Messaging Config" introduced="9.4" class="config"> 
-            <unit bldFile="sf\mw\messagingmw\messagingfw\msgconf\group" mrp="sf\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="Watcher Framework">
-            <unit bldFile="sf\mw\messagingmw\messagingfw\watcherfw\group" mrp="sf\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="Send As">
-            <unit bldFile="sf\mw\messagingmw\messagingfw\sendas\group" mrp="sf\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="Message URL Handler" introduced="7.0">
-            <unit bldFile="sf\mw\messagingmw\messagingfw\msgurlhandler\group" mrp="sf\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>
         </collection>
         <collection name="Messaging Plugins" level="plugins">
           <component name="BIO Watchers" plugin="Y" introduced="8.0">
-            <unit bldFile="sf\mw\messagingmw\messagingfw\biowatchers\Group" mrp="sf\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="Scheduled Send MTM" plugin="Y" introduced="6.0">
-            <unit bldFile="sf\mw\messagingmw\messagingfw\scheduledsendmtm\group" mrp="sf\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="POP3 and SMTP MTM" plugin="Y">
-            <unit bldFile="sf\app\messaging\email\pop3andsmtpmtm\group" mrp="sf\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="IMAP4 MTM" plugin="Y" introduced="9.2">
-            <unit bldFile="sf\app\messaging\email\imap4mtm\group" mrp="sf\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="OBEX MTMs" plugin="Y" introduced="7.0s">
-            <unit bldFile="sf\app\messaging\messagingappbase\obexmtms\Group" mrp="sf\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="SMS MTM" plugin="Y">
-            <unit bldFile="sf\app\messaging\mobilemessaging\smsmtm\multimode\Group" mrp="sf\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>
         </collection>
       </block>
       <block name="Remote Management" levels="framework services">
         <collection name="Sync and Remote Management Framework" level="framework">
           <component name="Connectivity Framework" introduced="7.0s">
-            <unit bldFile="sf\app\techview\connectivityapps\connectivityfw\group" mrp="sf\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>
           <component name="OMA SyncML Data Sync" introduced="7.0s">
-            <unit bldFile="sf\mw\remotemgmt\syncandremotemgmtfw\omasyncmldatasync\Group" mrp="sf\mw\remotemgmt\syncandremotemgmtfw\omasyncmldatasync\Group\oma_syncml_datasync.mrp"/>
+            <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\omasyncmldatasync\Group" mrp="mw\remotemgmt\syncandremotemgmtfw\omasyncmldatasync\Group\oma_syncml_datasync.mrp"/>
           </component>
           <component name="OMA SyncML Common Framework" introduced="7.0s">
-            <unit bldFile="sf\mw\remotemgmt\syncandremotemgmtfw\omasyncmlcommonfw\Group" mrp="sf\mw\remotemgmt\syncandremotemgmtfw\omasyncmlcommonfw\Group\oma_syncml_common_framework.mrp"/>
+            <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\omasyncmlcommonfw\Group" mrp="mw\remotemgmt\syncandremotemgmtfw\omasyncmlcommonfw\Group\oma_syncml_common_framework.mrp"/>
           </component>
           <component name="OMA SyncML DM Interface" introduced="7.0s">
-            <unit bldFile="sf\mw\remotemgmt\syncandremotemgmtfw\omasyncmldminterface\group" mrp="sf\mw\remotemgmt\syncandremotemgmtfw\omasyncmldminterface\group\oma_syncml_dm_interface.mrp"/>
+            <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\omasyncmldminterface\group" mrp="mw\remotemgmt\syncandremotemgmtfw\omasyncmldminterface\group\oma_syncml_dm_interface.mrp"/>
           </component>
           <component name="OMA SyncML Config" introduced="9.4">
-            <unit bldFile="sf\mw\remotemgmt\syncandremotemgmtfw\omasyncmlconfig\group" mrp="sf\mw\remotemgmt\syncandremotemgmtfw\omasyncmlconfig\group\oma_syncml_config.mrp"/>
+            <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\omasyncmlconfig\group" mrp="mw\remotemgmt\syncandremotemgmtfw\omasyncmlconfig\group\oma_syncml_config.mrp"/>
           </component>
           <component name="Device Management Framework" introduced="8.0">
-            <unit bldFile="sf\mw\remotemgmt\syncandremotemgmtfw\devicemgmtfw\group" mrp="sf\mw\remotemgmt\syncandremotemgmtfw\devicemgmtfw\group\devprov_devman_framework.mrp"/>
+            <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\devicemgmtfw\group" mrp="mw\remotemgmt\syncandremotemgmtfw\devicemgmtfw\group\devprov_devman_framework.mrp"/>
           </component>
           <component name="Client Provisioning Framework" introduced="9.1">
-            <unit bldFile="sf\mw\remotemgmt\syncandremotemgmtfw\clientprovisioningfw\Group" mrp="sf\mw\remotemgmt\syncandremotemgmtfw\clientprovisioningfw\Group\devprov_clientprov_framework.mrp"/>
+            <unit bldFile="mw\remotemgmt\syncandremotemgmtfw\clientprovisioningfw\Group" mrp="mw\remotemgmt\syncandremotemgmtfw\clientprovisioningfw\Group\devprov_clientprov_framework.mrp"/>
           </component>
         </collection>
         <collection name="Sync and Remote Management Services" level="services">
           <component name="Connectivity Services" introduced="7.0s">
-            <unit bldFile="sf\app\techview\connectivityapps\connectivityservices\group" mrp="sf\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>
           <component name="Data Sync Adaptors" plugin="Y" introduced="7.0s">
-            <unit bldFile="sf\mw\remotemgmt\syncandremotemgmtservices\datasyncadaptors\group" mrp="sf\mw\remotemgmt\syncandremotemgmtservices\datasyncadaptors\group\data_sync_adaptors.mrp"/>
+            <unit bldFile="mw\remotemgmt\syncandremotemgmtservices\datasyncadaptors\group" mrp="mw\remotemgmt\syncandremotemgmtservices\datasyncadaptors\group\data_sync_adaptors.mrp"/>
           </component>
           <component name="Device Management Adaptors" plugin="Y" introduced="9.1">
-            <unit bldFile="sf\mw\remotemgmt\syncandremotemgmtservices\devicemgmtadaptors\devman\Group" mrp="sf\mw\remotemgmt\syncandremotemgmtservices\devicemgmtadaptors\devman\Group\devprov_devman_adapters.mrp"/>
+            <unit bldFile="mw\remotemgmt\syncandremotemgmtservices\devicemgmtadaptors\devman\Group" mrp="mw\remotemgmt\syncandremotemgmtservices\devicemgmtadaptors\devman\Group\devprov_devman_adapters.mrp"/>
           </component>
           <component name="Client Provisioning Adaptors" plugin="Y" introduced="9.1">
-            <unit bldFile="sf\mw\remotemgmt\syncandremotemgmtservices\clientprovisioningadaptors\group" mrp="sf\mw\remotemgmt\syncandremotemgmtservices\clientprovisioningadaptors\group\devprov_clientprov_adapters.mrp"/>
+            <unit bldFile="mw\remotemgmt\syncandremotemgmtservices\clientprovisioningadaptors\group" mrp="mw\remotemgmt\syncandremotemgmtservices\clientprovisioningadaptors\group\devprov_clientprov_adapters.mrp"/>
           </component>
         </collection>
         <collection name="MTP Data Providers" level="services">
           <component name="MTP File and Folder Provider" plugin="Y" introduced="9.4">
-            <unit bldFile="sf\mw\remoteconn\mtpdataproviders\mtpfileandfolderprovider\group" mrp="sf\mw\remoteconn\mtpdataproviders\mtpfileandfolderprovider\group\mtp_filedp.mrp"/>
+            <unit bldFile="mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group" mrp="mw\remoteconn\mtpdataproviders\mtpfileandfolderdp\group\mtp_filedp.mrp"/>
           </component>
         </collection>
 				<collection name="Bluetooth Application Profiles" level="services"> 
 					<component name="Bluetooth AD2P" class="placeholder" introduced="9.4">
 					  <!-- PLACEHOLDER="DS.862"
-						<unit bldFile="sf\os/shortlinksrv/bluetoothmgmt/btcommon/profiles/a2dp/group" mrp="sf\os/shortlinksrv/bluetoothmgmt/btcommon/profiles/a2dp/group/bluetooth_a2dp.mrp"/>
+						<unit bldFile="os/shortlinksrv/bluetoothmgmt/btcommon/profiles/a2dp/group" mrp="os/shortlinksrv/bluetoothmgmt/btcommon/profiles/a2dp/group/bluetooth_a2dp.mrp"/>
 					    -->
 					</component>
 					<component name="Bluetooth SBC Encoder" class="placeholder" introduced="9.4" plugin="Y">
 					  <!-- PLACEHOLDER="DS.862"
-					  <unit bldFile="sf\os/shortlinksrv/bluetoothmgmt/btcommon/profiles/a2dp/sbcencoder/implementation" mrp="sf\os/shortlinksrv/bluetoothmgmt/btcommon/profiles/a2dp/sbcencoder/implementation/bluetooth_sbc.mrp"/>
+					  <unit bldFile="os/shortlinksrv/bluetoothmgmt/btcommon/profiles/a2dp/sbcencoder/implementation" mrp="os/shortlinksrv/bluetoothmgmt/btcommon/profiles/a2dp/sbcencoder/implementation/bluetooth_sbc.mrp"/>
 					  -->
 					</component>
         </collection>
@@ -1836,254 +1819,245 @@
      <layer name="MISC" levels="test pc-tools">
       <collection name="Connectivity PC Side" level="pc-tools">
         <component name="ConnectQI" contract="MRouterSDK" introduced="9.1" class="PC">
-          <unit mrp="sf\mw\remoteconn\connectivitypcside\connectqi\connectqisdk_mr3.mrp"/>
+          <unit mrp="mw\remoteconn\connectivitypcside\connectqi\connectqisdk_mr3.mrp"/>
         </component>
         <component name="ConnectQI SDK" introduced="9.1" class="PC">
-          <unit mrp="sf\mw\remoteconn\connectivitypcside\connectqisdk\connectqisdk_public.mrp"/>
+          <unit mrp="mw\remoteconn\connectivitypcside\connectqisdk\connectqisdk_public.mrp"/>
         </component>
       </collection>
       <collection name="Comms PC Side" level="pc-tools">
         <component name="Prepare Default Comms Database" filter="gt" class="config PC">
-          <unit bldFile="sf\os\commsfw\commsconfigutils\commsdatabase\defaultcommdb\group" mrp="sf\os\commsfw\commsconfigutils\commsdatabase\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>
         <component name="Install Default Comms Database" class="PC">
-          <unit bldFile="sf\os\commsfw\commsconfigutils\commsdatabase\installdefaultcommdb\group" mrp="sf\os\commsfw\commsconfigutils\commsdatabase\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="Comms Tools" introduced="9.4" class="PC">
-          <unit mrp="sf\os\commsfw\commspcside\commstools\group\comms-infras_tools.mrp"/>
+          <unit mrp="os\commsfw\commsfwtools\commstools\group\comms-infras_tools.mrp"/>
         </component>
       </collection>
       <collection name="Remote Management Test" level="test">
         <component name="OMA SyncML Integration Test" introduced="7.0s" class="test">
-          <unit bldFile="sf\mw\remotemgmt\remotemgmttest\omasyncmlintegrationtest\group" mrp="sf\mw\remotemgmt\remotemgmttest\omasyncmlintegrationtest\group\oma_syncml_integtest.mrp"/>
+          <unit bldFile="mw\remotemgmt\remotemgmttest\omasyncmlintegrationtest\group" mrp="mw\remotemgmt\remotemgmttest\omasyncmlintegrationtest\group\oma_syncml_integtest.mrp"/>
         </component>
         <component name="OMA Device Management Integration Test" introduced="9.1" class="test">
-          <unit bldFile="sf\mw\remotemgmt\remotemgmttest\omadevicemgmtintegrationtest\group" mrp="sf\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>
       </collection>
       <collection name="Time Zone PC Side" level="pc-tools">
         <component name="Time Zone Compiler" introduced="9.1" class="config PC">
-          <unit bldFile="sf\mw\appsupport\tzpcside\tzcompiler\group" mrp="sf\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="World Database Kit" introduced="6.0" deprecated="9.1" class="config PC">
-          <unit bldFile="sf\mw\appsupport\tzpcside\worlddatabasekit\group" mrp="sf\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="World Tools" introduced="5.0" deprecated="9.1" class="config PC">
-          <unit bldFile="sf\mw\appsupport\tzpcside\worldtools\group" mrp="sf\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="Secure Software Install Tools" level="pc-tools">
         <component name="SWI Analysis Toolkit" class="PC">
-          <unit bldFile="sf\os\misc\secureswitools\swianalysistoolkit\group" mrp="sf\os\misc\secureswitools\swianalysistoolkit\group\security_switools.mrp"/>
+          <unit bldFile="mw\appinstall\secureswitools\swianalysistoolkit\group" mrp="mw\appinstall\secureswitools\swianalysistoolkit\group\security_switools.mrp"/>
         </component>
         <component name="Secure Software Install SIS Tools" class="PC">
-          <unit bldFile="sf\os\misc\secureswitools\swisistools\group" mrp="sf\os\misc\secureswitools\swisistools\group\security_sistools.mrp"/>
+          <unit bldFile="mw\appinstall\secureswitools\swisistools\group" mrp="mw\appinstall\secureswitools\swisistools\group\security_sistools.mrp"/>
         </component>
         <component name="OpenSSL Library" class="PC">
-          <unit mrp="sf\os\misc\secureswitools\openssllib\security_openssl.mrp"/>
+          <unit mrp="mw\appinstall\secureswitools\openssllib\security_openssl.mrp"/>
         </component>
       </collection>
       <collection name="Security and Data Privacy Tools" level="pc-tools">
           <component name="Security Tools" class="PC" introduced="9.4">
-            <unit bldFile="sf\os\security\securityanddataprivacytools\securitytools\group" mrp="sf\os\security\securityanddataprivacytools\securitytools\group\security_tools.mrp"/>
+            <unit bldFile="os\security\securityanddataprivacytools\securitytools\group" mrp="os\security\securityanddataprivacytools\securitytools\group\security_tools.mrp"/>
         </component>
       </collection>
       <collection name="Graphics Test" level="test">
         <component name="Graphics Test Harness" class="test">
-          <unit mrp="sf\os\graphics\graphicstest\graphicstestharness\group\graphics_testharness.mrp"/>
+          <unit mrp="os\graphics\graphicstest\graphicstestharness\group\graphics_testharness.mrp"/>
         </component>
         <component name="UI Bench" introduced="9.2" class="test">
-          <unit bldFile="sf\os\graphics\graphicstest\uibench\group" mrp="sf\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="Graphics Tools" level="pc-tools">
         <component name="GDI Tools" class="PC">
-          <unit bldFile="sf\os\graphics\graphicstools\gdi_tools\group" mrp="sf\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>
         <component name="Bitmap Font Tools" class="PC">
-          <unit bldFile="sf\os\graphics\graphicstools\bitmapfonttools\group" mrp="sf\os\graphics\graphicstools\bitmapfonttools\group\graphics_gdtran.mrp"/>
+          <unit bldFile="os\graphics\graphicstools\bitmapfonttools\group" mrp="os\graphics\graphicstools\bitmapfonttools\group\graphics_gdtran.mrp"/>
         </component>
       </collection>
       <collection name="Kernel Test" level="test">
         <component name="E32 Tests" class="test">
-          <unit bldFile="sf\os\kernelhwsrv\kerneltest\e32test\group" mrp="sf\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="SDIO Tests" filter="gt" introduced="9.2" class="test">
-          <unit bldFile="sf\os\kernelhwsrv\kerneltest\sdiotest" mrp="sf\os\kernelhwsrv\kerneltest\sdiotest\base_sdiotests.mrp"/>
+          <unit bldFile="os\kernelhwsrv\kerneltest\sdiotest" mrp="os\kernelhwsrv\kerneltest\sdiotest\base_sdiotests.mrp"/>
         </component>
         <component name="E32 Utilities" contract="NAND_Flash_XSR_Unistore_2_Other_Portions">
-          <unit bldFile="sf\os\kernelhwsrv\kerneltest\e32utils\group" mrp="sf\os\kernelhwsrv\kerneltest\e32utils\group\base_e32utils.mrp"/>
+          <unit bldFile="os\kernelhwsrv\kerneltest\e32utils\group" mrp="os\kernelhwsrv\kerneltest\e32utils\group\base_e32utils.mrp"/>
         </component>
         <component name="File Server Tests" class="test">
-          <unit bldFile="sf\os\kernelhwsrv\kerneltest\f32test\group" mrp="sf\os\kernelhwsrv\kerneltest\f32test\group\base_f32test.mrp"/>
+          <unit bldFile="os\kernelhwsrv\kerneltest\f32test\group" mrp="os\kernelhwsrv\kerneltest\f32test\group\base_f32test.mrp"/>
         </component>
       </collection>
       <collection name="Applications Test" level="test">
         <component name="Core Apps Test" introduced="8.1" class="test">
           <!-- XML Previous Location: Application Services/Other Application Services/ -->
-          <unit mrp="sf\mw\appsupport\commonappservices\coreappstest\Group\app-services_CoreAppsTest.mrp"/>
+          <unit mrp="mw\appsupport\commonappservices\coreappstest\Group\app-services_CoreAppsTest.mrp"/>
         </component>
         <component name="Agenda Model Test" introduced="8.1" class="test">
-          <unit bldFile="sf\os\unref\comgen\app-engines\test_engineering\agendaserver\TestAgendaSrv" mrp="sf\os\unref\comgen\app-engines\test_engineering\agendaserver\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="Alarm Server Test" introduced="8.1" class="test">
-          <unit bldFile="sf\mw\appsupport\commonappservices\alarmservertest\TestAlarmSrv" mrp="sf\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="Time Zone Localization Resource Factory" introduced="9.1" class="config">
-          <unit bldFile="sf\mw\appsupport\tzservices\tzlocalizationrscfactory\group" mrp="sf\mw\appsupport\tzservices\tzlocalizationrscfactory\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="Time Zone Database" introduced="9.1" class="config">
-          <unit bldFile="sf\mw\appsupport\tzservices\tzdatabase\group" mrp="sf\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="World Server Test" introduced="8.1" deprecated="9.1" class="test">
-          <unit bldFile="sf\mw\appsupport\tzservices\worldservertest\TestWorldSrv" mrp="sf\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>
         <component name="Messaging Test">
           <!-- XML Previous Location: Application Services/Messaging Application Support/ -->
-          <unit bldFile="sf\mw\messagingmw\messagingfw\msgtest\group" mrp="sf\mw\messagingmw\messagingfw\msgtest\group\messaging_test.mrp"/>
+          <unit bldFile="mw\messagingmw\messagingfw\msgtest\group" mrp="mw\messagingmw\messagingfw\msgtest\group\messaging_test.mrp"/>
         </component>
       </collection>
       <collection name="Integration Test" level="test">
         <component name="Networking Integration Test" introduced="ER5" class="test">
-          <unit bldFile="sf\os\networkingsrv\networkingtestandutils\networkingintegrationtest\Group" mrp="sf\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="MTP Integration Test" introduced="9.4" class="test">
-          <unit bldFile="sf\mw\remoteconn\mtptransfw\mtpintegrationtest\group" mrp="sf\mw\remoteconn\mtptransfw\mtpintegrationtest\group\mtp_test.mrp"/>
+          <unit bldFile="mw\remoteconn\mtpfws\mtpintegrationtest\group" mrp="mw\remoteconn\mtpfws\mtpintegrationtest\group\mtp_test.mrp"/>
         </component>
         <component name="Base Integration Test">
-          <unit bldFile="sf\os\kernelhwsrv\baseintegtests\baseintegrationtest\group" mrp="sf\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>
         <component name="UIF Test Framework" class="test">
-          <unit mrp="sf\mw\appsupport\appfw\uiftestfw\group\app-framework_testframework.mrp"/>
+          <unit mrp="mw\appsupport\appfw\uiftestfw\group\app-framework_testframework.mrp"/>
         </component>
         <component name="Word" class="test">
-          <unit mrp="sf\os\textandloc\textrendering\word\group\app-framework_word.mrp"/>
+          <unit mrp="os\textandloc\textrendering\word\group\app-framework_word.mrp"/>
         </component>
         <component name="Messaging Tests">
-          <unit mrp="sf\mw\messagingmw\messagingfw\msgtests\group\messaging.mrp"/>
+          <unit mrp="mw\messagingmw\messagingfw\msgtests\group\messaging.mrp"/>
         </component>
         <component name="Messaging Test Framework">
-          <unit mrp="sf\mw\messagingmw\messagingfw\msgtestfw\group\messaging_testframework.mrp"/>
+          <unit mrp="mw\messagingmw\messagingfw\msgtestfw\group\messaging_testframework.mrp"/>
         </component>
         <component name="Security Test Framework" introduced="7.0" class="test">
-          <unit mrp="sf\os\security\cryptomgmtlibs\securitytestfw\group\security_testframework.mrp"/>
+          <unit mrp="os\security\cryptomgmtlibs\securitytestfw\group\security_testframework.mrp"/>
         </component>
       </collection>
       <collection name="Multimedia Validation Suite" level="test">
         <component name="Multimedia Validation Suite Application" introduced="9.4" class="test">
-          <unit bldFile="sf\mw\mmmw\mmvalidationsuite\mmvalidationsuiteapp\group" mrp="sf\mw\mmmw\mmvalidationsuite\mmvalidationsuiteapp\group\multimedia_mvs_app.mrp"/>
+          <unit bldFile="mw\mmmw\mmvalidationsuite\mmvalidationsuiteapp\group" mrp="mw\mmmw\mmvalidationsuite\mmvalidationsuiteapp\group\multimedia_mvs_app.mrp"/>
         </component>
         <component name="Multimedia Validation Suite Agents" introduced="9.4">
-          <unit bldFile="sf\mw\mmmw\mmvalidationsuite\mmvalidationsuiteagents\group" mrp="sf\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="MVS Integration Tests" introduced="9.4" class="test">
-          <unit mrp="sf\mw\mmmw\mmvalidationsuite\mvsintegrationtest\group\multimedia_inttest_mvs_source.mrp"/>
+          <unit mrp="mw\mmmw\mmvalidationsuite\mvsintegrationtest\group\multimedia_inttest_mvs_source.mrp"/>
         </component>
       </collection>
       <collection name="Multimedia Unit Tests" level="test">
         <component name="Multimedia Test Framework" introduced="7.0s" class="test">
-          <unit mrp="sf\os\mm\mmtestenv\mmtestfw\group\multimedia_testframework_source.mrp"/>
+          <unit mrp="os\mm\mmtestenv\mmtestfw\group\multimedia_testframework_source.mrp"/>
         </component>
         <component name="Multimedia Test Framework Unit Tests" introduced="7.0s" class="test">
-          <unit mrp="sf\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="MDF Unit Tests" introduced="9.2" class="test">
-          <unit mrp="sf\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="MMF Unit Tests" introduced="7.0s" class="test">
-          <unit mrp="sf\mw\mmmw\mmfwtest\mmfunittest\group\multimedia_unittest_mmf_source.mrp"/>
+          <unit mrp="mw\mmmw\mmfwtest\mmfunittest\group\multimedia_unittest_mmf_source.mrp"/>
         </component>
         <component name="Imaging Unit Tests" introduced="7.0s" class="test">
-          <unit mrp="sf\os\mm\imagingandcamerafws\imagingunittest\group\multimedia_unittest_icl_source.mrp"/>
+          <unit mrp="os\mm\imagingandcamerafws\imagingunittest\group\multimedia_unittest_icl_source.mrp"/>
         </component>
         <component name="Camera Unit Tests" introduced="9.2" class="test">
-          <unit mrp="sf\os\mm\imagingandcamerafws\cameraunittest\group\multimedia_unittest_ecam_source.mrp"/>
-        </component>
-        <component name="Tuner Unit Tests" introduced="9.1" class="test">
-          <unit mrp="sf\mw\mmmw\mmmiddlewarefws\tunerunittest\group\multimedia_unittest_tuner_source.mrp"/>
+          <unit mrp="os\mm\imagingandcamerafws\cameraunittest\group\multimedia_unittest_ecam_source.mrp"/>
         </component>
         <component name="Mobile TV DVB-H Unit Tests" introduced="9.5" class="test">
-          <unit mrp="sf\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>
       </collection>
       <collection name="Multimedia Test" level="test">
         <component name="A3F Integration Tests">
-          <unit mrp="sf\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="A3F Characterisation Tests" introduced="9.4" class="test">
-          <unit mrp="sf\os\unref\orphan\comgen\multimedia\char\a3f\devsound\group\multimedia_a3f_devsound_char.mrp"/>
+          <unit mrp="os\mm\devsound\a3fcharacterisationtest\group\multimedia_a3f_devsound_char.mrp"/>
         </component>
         <component name="Multimedia Test Agent" introduced="8.0" class="test">
-          <unit mrp="sf\os\mm\mmtestenv\mmtestagent\group\multimediatestagent_source.mrp"/>
+          <unit mrp="os\mm\mmtestenv\mmtestagent\group\multimediatestagent_source.mrp"/>
         </component>
         <component name="MMF Integration Tests" introduced="7.0s" class="test">
-          <unit mrp="sf\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="Imaging Integration Tests" introduced="7.0s" class="test">
-          <unit mrp="sf\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="Multimedia Test Tools">
-          <unit mrp="sf\os\mm\mmtestenv\mmtesttools\Group\multimedia_testtools_source.mrp"/>
+          <unit mrp="os\mm\mmtestenv\mmtesttools\Group\multimedia_testtools_source.mrp"/>
         </component>
         <component name="MMF Characterisation Validation" introduced="9.3" class="test">
-          <unit bldFile="sf\mw\mmmw\mmfwtest\mmfcharacterisationvalidation\group" mrp="sf\mw\mmmw\mmfwtest\mmfcharacterisationvalidation\group\multimedia_mmf_char.mrp"/>
+          <unit bldFile="mw\mmmw\mmfwtest\mmfcharacterisationvalidation\group" mrp="mw\mmmw\mmfwtest\mmfcharacterisationvalidation\group\multimedia_mmf_char.mrp"/>
         </component>
       </collection>
       <collection name="Shortlink Test" level="test">
          <component name="USB Manager Tests" introduced="7.0" class="test">
-          <unit version="2" mrp="sf\os\shortlinksrv\usbmgmt\usbmgrtest\group\usb_test.mrp"/>
+          <unit version="2" mrp="os\shortlinksrv\usbmgmt\usbmgrtest\group\usb_test.mrp"/>
         </component>
         <component name="Bluetooth Examples and Tests" introduced="6.1" class="test">
-          <unit mrp="sf\os\shortlinksrv\bluetooth\btexample\test\bluetooth_tests_examples.mrp"/>
-        </component>
-        <component name="IrDA Test" introduced="9.2" class="test">
-          <unit mrp="sf\os\shortlinksrv\irda\irdatest\group\infra-red_irda_test.mrp"/>
+          <unit mrp="os\shortlinksrv\bluetooth\btexample\test\bluetooth_tests_examples.mrp"/>
         </component>
       </collection>
       <collection name="Comms Test" level="test">
         <component name="Networking Dialog Stub" introduced="6.1">
-          <unit bldFile="sf\os\commsfw\datacommsserver\networkingdialogapi\default" mrp="sf\os\commsfw\datacommsserver\networkingdialogapi\default\networking_dialog_default.mrp"/>
+          <unit bldFile="os\commsfw\datacommsserver\networkingdialogapi\default" mrp="os\commsfw\datacommsserver\networkingdialogapi\default\networking_dialog_default.mrp"/>
         </component>
         <component name="Networking ROM">
           <!--  production component: contains the IBY files -->
-          <unit bldFile="sf\os\networkingsrv\networkingtestandutils\networkingrom\group" mrp="sf\os\networkingsrv\networkingtestandutils\networkingrom\group\networking_general.mrp"/>
+          <unit bldFile="os\networkingsrv\networkingsrv_info\networkingrom\group" mrp="os\networkingsrv\networkingsrv_info\networkingrom\group\networking_general.mrp"/>
         </component>
         <component name="Networking Unit Test" introduced="7.0" class="test">
-          <unit mrp="sf\os\networkingsrv\networkingtestandutils\networkingunittest\group\networking_unittest.mrp"/>
+          <unit mrp="os\networkingsrv\networkingtestandutils\networkingunittest\group\networking_unittest.mrp"/>
         </component>
       </collection>
       <collection name="IP Examples" level="test">
         <component name="Networking Examples" introduced="7.0">
-          <unit bldFile="sf\os\networkingsrv\networkingtestandutils\networkingexamples\examplecode\group" mrp="sf\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="Example Internet Utilities" introduced="ER5">
-          <unit mrp="sf\os\networkingsrv\networkingtestandutils\exampleinternetutilities\group\networking_inetutil.mrp"/>
+          <unit mrp="os\networkingsrv\networkingtestandutils\exampleinternetutilities\group\networking_inetutil.mrp"/>
         </component>
         <component name="IPv6 to 4 Tunnel" plugin="Y">
-          <unit mrp="sf\os\networkingsrv\networkingtestandutils\ipv6to4tunnel\group\networking_6to4.mrp"/>
+          <unit mrp="os\networkingsrv\networkingtestandutils\ipv6to4tunnel\group\networking_6to4.mrp"/>
         </component>
         <component name="IP Administration Tool" introduced="7.0">
-          <unit mrp="sf\app\techview\networkingutils\ipadministrationtool\group\networking_ipadm.mrp"/>
+          <unit mrp="app\techview\networkingutils\ipadministrationtool\group\networking_ipadm.mrp"/>
         </component>
         <component name="IP Analyzer" introduced="7.0">
-          <unit mrp="sf\os\networkingsrv\networkingtestandutils\ipanalyzer\group\networking_iprotor.mrp"/>
+          <unit mrp="os\networkingsrv\networkingtestandutils\ipanalyzer\group\networking_iprotor.mrp"/>
         </component>
         <component name="Name Resolver Utility" introduced="7.0s">
-          <unit mrp="sf\app\techview\networkingutils\nameresolverutility\group\networking_nslookup.mrp"/>
+          <unit mrp="app\techview\networkingutils\nameresolverutility\group\networking_nslookup.mrp"/>
         </component>
         <component name="IP Probe" plugin="Y" introduced="7.0s">
-          <unit mrp="sf\os\networkingsrv\networkingtestandutils\ipprobe\group\networking_probe.mrp"/>
+          <unit mrp="os\networkingsrv\networkingtestandutils\ipprobe\group\networking_probe.mrp"/>
         </component>
       </collection>
       <collection name="Miscellaneous" level="test">
-        <component name="DUMMY">
-          <unit bldFile="sf\os\misc\miscellaneous\dummy" mrp="sf\os\misc\miscellaneous\dummy\additional_dummy.mrp"/>
-        </component>
         <component name="SYSTEMMONITOR">
-          <unit bldFile="sf\os\buildtools\toolsandutils\systemmonitor\group" mrp="sf\os\buildtools\toolsandutils\systemmonitor\group\testtools_systemmonitor.mrp"/>
+          <unit bldFile="os\buildtools\toolsandutils\systemmonitor\group" mrp="os\buildtools\toolsandutils\systemmonitor\group\testtools_systemmonitor.mrp"/>
         </component>
         <component name="TESTTOOLS_UTILITIES">
-          <unit bldFile="sf\os\persistentdata\loggingservices\rfilelogger\group" mrp="sf\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>
     </layer>
@@ -2121,7 +2095,8 @@
   <targetList name="gccxml_rel" description="tools Release Targets" target="GCCXML_REL"/>
   <!-- 9.4 configuration -->
     <!-- tb91 configuration -->
-  <configuration name="GT_tb91sf" description="tb91sf GT build" filter="raptor_GT_tb91sf,gt">
+    <!-- tb91sf configuration -->
+  <configuration name="GT_tb91sf" description="tb91sf GT build" filter="raptor_tb91sf,gt">
     <ref item="Tools and Utils and SDKENG"/>
     <ref item="HAL"/>
     <ref item="Kernel Services"/>
@@ -2130,8 +2105,8 @@
     <ref item="Application Services"/>
     <ref item="UI"/>
     <ref item="MISC"/>
-    <task><specialInstructions name="BootStrap1" cwd="os\buildtools\toolsandutils\e32toolp\group" command="setupprj.bat secure"/></task>
-    <task><specialInstructions name="BootStrap2" cwd="os\buildtools\toolsandutils\e32toolp\group" command="bld.bat rel"/></task>
+    <task><specialInstructions name="BootStrap1" cwd="os\buildtools\sbsv1_os\e32toolp\group" command="setupprj.bat secure"/></task>
+    <task><specialInstructions name="BootStrap2" cwd="os\buildtools\sbsv1_os\e32toolp\group" command="bld.bat rel"/></task>
     <task><buildLayer command="bldmake bldfiles" unitParallel="Y"/></task>
     <task><buildLayer command="abld export" unitParallel="Y"/></task>
     <task><buildLayer command="abld makefile" targetList="tools" unitParallel="Y" targetParallel="N"/></task>
diff -r aabc3db64314 -r 87f2aa577254 ex-nokia/sysdefs/system_model_s60.xml
--- a/ex-nokia/sysdefs/system_model_s60.xml	Thu May 07 15:01:22 2009 +0100
+++ b/ex-nokia/sysdefs/system_model_s60.xml	Thu May 07 18:58:02 2009 +0100
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE SystemDefinition [
  <!ELEMENT SystemDefinition (systemModel?, build?)>
  <!ATTLIST SystemDefinition
@@ -11,7 +11,11 @@
   levels CDATA #IMPLIED
   span CDATA #IMPLIED>
  <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ATTLIST logicalset
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED
+  level CDATA #IMPLIED>
  <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
  <!ATTLIST logicalsubset name CDATA #REQUIRED>
  <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
@@ -87,23 +91,8 @@
   cwd CDATA #REQUIRED
   command CDATA #REQUIRED>
 ]>
-<!-- 
-============================================================================ 
-Name        : sysdef_dtd_1_4_0.xml 
-Part of     : Helium 
-Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-All rights reserved.
-This component and the accompanying materials are made available
-under the terms of the License "Eclipse Public License v1.0"
-which accompanies this distribution, and is available
-at the URL "http://www.eclipse.org/legal/epl-v10.html".
-Initial Contributors:
-Nokia Corporation - initial contribution.
-Contributors:
-Description:
-============================================================================
--->
-<SystemDefinition name="sysdef_dtd_1_4_0_xml + S60_SystemBuild + S60_SystemModel" schema="1.4.0"><systemModel>
+<SystemDefinition name="S60_SystemModel + S60_SystemBuild" schema="1.4.0">
+<systemModel>
 <layer name="sf">
 <logicalset name="adaptation">
 <logicalsubset name="stubs">
@@ -122,11 +111,6 @@
 <unit unitID="sf_adaptation_stubs_drm_stubs" name="drm_stubs" bldFile="\sf\adaptation\stubs\drm_stubs\group" mrp="" filter="!no_stubs"/>
 </component>
 </module>
-<module name="licensee_tsy_stub">
-<component name="licensee_tsy_stub">
-<unit unitID="sf_adaptation_stubs_licensee_tsy_stub" name="licensee_tsy_stub" bldFile="\sf\adaptation\stubs\licensee_tsy_stub\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
 <module name="ocrsrv_stub">
 <component name="ocrsrv_stub">
 <unit unitID="sf_adaptation_stubs_ocrsrv_stub" name="ocrsrv_stub" bldFile="\sf\adaptation\stubs\ocrsrv_stub\group" mrp="" filter="!no_stubs"/>
@@ -147,11 +131,6 @@
 <unit unitID="sf_adaptation_stubs_power_save_display_mode_stub" name="power_save_display_mode_stub" bldFile="\sf\adaptation\stubs\power_save_display_mode_stub\group" mrp="" filter="!no_stubs"/>
 </component>
 </module>
-<module name="simatk_tsy_stub">
-<component name="simatk_tsy_stub">
-<unit unitID="sf_adaptation_stubs_simatk_tsy_stub" name="simatk_tsy_stub" bldFile="\sf\adaptation\stubs\simatk_tsy_stub\group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
 <module name="srsfenginestub">
 <component name="srsfenginestub">
 <unit unitID="sf_adaptation_stubs_srsfenginestub" name="srsfenginestub" bldFile="\sf\adaptation\stubs\srsfenginestub\group" mrp="" filter="!no_stubs"/>
@@ -635,6 +614,16 @@
 <unit unitID="sf_mw_mmmw" name="mmmw" bldFile="\sf\mw\mmmw\group" mrp=""/>
 </component>
 </module>
+<module name="metadatautility">
+<component name="3GPExtParserLib">
+<unit unitID="sf_mw_mmmw_metadatautility_3GPExtParserLib" name="3GPExtParserLib" bldFile="\sf\mw\mmmw\metadatautility\3GPExtParserLib\group" mrp=""/>
+</component>
+</module>
+<module name="mmfw">
+<component name="gstreamer">
+<unit unitID="sf_mw_mmmw_mmfw_gstreamer" name="gstreamer" bldFile="\sf\mw\mmmw\mmfw\gstreamer\group" mrp=""/>
+</component>
+</module>
 <module name="mtp">
 <component name="mtp">
 <unit unitID="sf_mw_mmmw_mtp" name="mtp" bldFile="\sf\mw\mmmw\mtp\group" mrp=""/>
@@ -769,6 +758,11 @@
 <unit unitID="sf_mw_uitools" name="uitools" bldFile="\sf\mw\uitools\group" mrp=""/>
 </component>
 </module>
+<module name="toollibraries">
+<component name="toollibraries">
+<unit unitID="sf_mw_uitools_toollibraries" name="toollibraries" bldFile="\sf\mw\uitools\toollibraries\group" mrp=""/>
+</component>
+</module>
 </logicalsubset>
 <logicalsubset name="videoutils">
 <module name="videoutils">
@@ -823,6 +817,11 @@
 <unit unitID="sf_os_deviceplatformrelease_S60LocFiles" name="S60LocFiles" bldFile="\sf\os\deviceplatformrelease\S60LocFiles\group" mrp=""/>
 </component>
 </module>
+<module name="S60LocFiles">
+<component name="group_oem">
+<unit unitID="sf_os_deviceplatformrelease_S60LocFiles_group_oem" name="group_oem" bldFile="\sf\os\deviceplatformrelease\S60LocFiles\group_oem" mrp=""/>
+</component>
+</module>
 <module name="Version">
 <component name="Version">
 <unit unitID="sf_os_deviceplatformrelease_Version" name="Version" bldFile="\sf\os\deviceplatformrelease\Version\group" mrp=""/>
@@ -848,8 +847,13 @@
 </component>
 </module>
 <module name="graphicsaccelaration">
-<component name="graphicsaccelaration">
-<unit unitID="sf_os_graphics_graphicsaccelaration" name="graphicsaccelaration" bldFile="\sf\os\graphics\graphicsaccelaration\group" mrp=""/>
+<component name="2D_OpenVG_1_0">
+<unit unitID="sf_os_graphics_graphicsaccelaration_2D_OpenVG_1_0" name="2D_OpenVG_1_0" bldFile="\sf\os\graphics\graphicsaccelaration\2D_OpenVG_1_0\group" mrp=""/>
+</component>
+</module>
+<module name="graphicsaccelaration">
+<component name="3d_opengl_es_1_1">
+<unit unitID="sf_os_graphics_graphicsaccelaration_3d_opengl_es_1_1" name="3d_opengl_es_1_1" bldFile="\sf\os\graphics\graphicsaccelaration\3d_opengl_es_1_1\group" mrp=""/>
 </component>
 </module>
 </logicalsubset>
@@ -916,11 +920,6 @@
 <unit unitID="sf_os_mm_devsoundextensions_addeddevsoundcontrol" name="addeddevsoundcontrol" bldFile="\sf\os\mm\devsoundextensions\addeddevsoundcontrol\Group" mrp=""/>
 </component>
 </module>
-<module name="devsoundextensions">
-<component name="mmfdevsoundserverplatsec">
-<unit unitID="sf_os_mm_devsoundextensions_mmfdevsoundserverplatsec" name="mmfdevsoundserverplatsec" bldFile="\sf\os\mm\devsoundextensions\mmfdevsoundserverplatsec\Group" mrp="" filter="!no_stubs"/>
-</component>
-</module>
 <module name="video">
 <component name="ARM_MDF_Decoders">
 <unit unitID="sf_os_mm_video_ARM_MDF_Decoders" name="ARM_MDF_Decoders" bldFile="\sf\os\mm\video\ARM_MDF_Decoders\group" mrp=""/>
@@ -1009,6 +1008,15 @@
 </logicalset>
 </layer>
 <layer name="ext">
+<logicalset name="app">
+<logicalsubset name="eas">
+<module name="eas">
+<component name="eas">
+<unit unitID="ext_app_eas" name="eas" bldFile="\ext\app\eas\group" mrp=""/>
+</component>
+</module>
+</logicalsubset>
+</logicalset>
 <logicalset name="mw">
 <logicalsubset name="websrvde">
 <module name="websrvde">
@@ -1034,6 +1042,18 @@
 </module>
 </logicalsubset>
 </logicalset>
+</layer>
+<layer name="SF_SOS">
+<module name="sf_licenseetsystub">
+<component name="sf_licenseetsystub">
+<unit unitID="sf_os_cellularsrv_telephonyserverplugins_licenseetsystub" name="sf_licenseetsystub" bldFile="\sf\os\cellularsrv\telephonyserverplugins\licenseetsystub\group" mrp="" filter="!no_stubs"/>
+</component>
+</module>
+<module name="sf_common_tsy">
+<component name="sf_common_tsy">
+<unit unitID="sf_os_cellularsrv_telephonyserverplugins_common_tsy" name="sf_common_tsy" bldFile="\sf\os\cellularsrv\telephonyserverplugins\common_tsy\group" mrp="" filter=""/>
+</component>
+</module>
 </layer></systemModel>
 <build>
     <option name="KEEPGOING" abldOption="-keepgoing" description="Causes make to keepgoing on errors" enable="Y"/>
@@ -1095,7 +1115,7 @@
 -->
 <!--  OS Extension build configurations start  -->
     <unitList name="S60_COMMON_OSEXTENSION" description="S60 common OSExtension">
-				<unitRef unit="sf_os_cellularsrv"/>
+				<unitRef unit="sf_os_cellularsrv_telephonyserverplugins_common_tsy"/>
         <unitRef unit="sf_os_deviceplatformrelease_S60LocFiles"/>   			
         <unitRef unit="sf_os_deviceplatformrelease_S60Extras"/>   			
         <unitRef unit="sf_os_deviceplatformrelease_S60Helps"/>
@@ -1106,13 +1126,14 @@
 				<unitRef unit="sf_os_lbs"/>
 				<unitRef unit="sf_os_mm"/>
 				<unitRef unit="sf_os_networkingsrv"/>
-				<unitRef unit="sf_os_mm_devsoundextensions_mmfdevsoundserverplatsec"/>
 				<unitRef unit="sf_os_mm_devsoundextensions_addeddevsoundcontrol"/>
 				<unitRef unit="sf_os_shortlinksrv"/>
 				<unitRef unit="sf_os_wlan"/>
 				<unitRef unit="sf_ostools_osrndtools"/>
 			</unitList>
     <unitList name="S60_COMMON_OSEXTENSION_OEM" description="S60 common OSExtension OEM">
+				<unitRef unit="sf_os_deviceplatformrelease_S60LocFiles_group_oem"/>
+				<unitRef unit="sf_os_cellularsrv"/>
 				<unitRef unit="sf_os_imagingext_imagingmodules_Build"/>
 				<unitRef unit="sf_os_imagingext_imagingmodules_H264AVCVideoEncARM"/>
 				<unitRef unit="sf_os_mm_audio_AacEncoderPlugin"/>
@@ -1131,7 +1152,6 @@
 				<unitRef unit="sf_mw_camerasrv"/>
 				<unitRef unit="sf_mw_dlnasrv"/>
 				<unitRef unit="sf_mw_drm"/>
-				<unitRef unit="sf_mw_helix"/>
 				<unitRef unit="sf_mw_homescreensrv"/>
 				<unitRef unit="sf_mw_imghandling"/>
 				<unitRef unit="sf_mw_imsrv"/>
@@ -1211,15 +1231,13 @@
 				<!--unitRef unit="sf_tools_platsim"/-->
 				<unitRef unit="sf_tools_rndtools"/>
 				<unitRef unit="sf_tools_swconfigtools"/>
-				<unitRef unit="ext_mw_websrvde"/>
-				<unitRef unit="ext_tools_oemrndtools"/>
 				<unitRef unit="sf_tools_themeinstaller"/>
-				<unitRef unit="ext_tools_toolsextensions"/>
 				<unitRef unit="sf_app_commonemail"/>
 				<unitRef unit="sf_app_radio"/>
 				<unitRef unit="sf_app_printing"/>
 				<unitRef unit="sf_mw_hapticsservices"/>
 				<unitRef unit="sf_app_gallery"/>
+				<unitRef unit="ext_tools_toolsextensions"/>
     </unitList>
     <unitList name="S60_OEM_BUILD" description="S60 OEM build">
 				<unitRef unit="sf_mw_mmmw_mtp"/>
@@ -1229,15 +1247,21 @@
 				<unitRef unit="sf_mw_shortlinkconn_usbclasses_usbosdescriptorhandler"/>
 				<unitRef unit="sf_app_videotelephony_packetvideoengine_PacketVideoEngineBinaries"/>
 				<unitRef unit="sf_app_videotelephony_vtprotocols"/>
-				<unitRef unit="sf_os_graphics_graphicsaccelaration"/>
+				<unitRef unit="sf_os_graphics_graphicsaccelaration_2D_OpenVG_1_0"/>
+				<unitRef unit="sf_os_graphics_graphicsaccelaration_3d_opengl_es_1_1"/>
 				<unitRef unit="sf_os_graphics_graphics_pub"/>
 				<unitRef unit="sf_app_java"/>
 				<unitRef unit="sf_mw_appsupport_appsupport_plat_flash_mmi_service_interface_custom_api"/>
 				<unitRef unit="sf_mw_appsupport_appsupport_plat_flash_netscape_plugin_command_api"/>
+				<unitRef unit="sf_mw_uitools_toollibraries"/>
+				<unitRef unit="sf_mw_mmmw_metadatautility_3GPExtParserLib"/>
+				<unitRef unit="sf_mw_mmmw_mmfw_gstreamer"/>
+				<unitRef unit="ext_app_eas"/>
+				<unitRef unit="ext_mw_websrvde"/>
+				<unitRef unit="ext_tools_oemrndtools"/>
     </unitList>
     <unitList name="S60_COMMON_OSEXTENSION_STUBS" description="S60 common OSExtension">
-    	<unitRef unit="sf_adaptation_stubs_licensee_tsy_stub"/>
-    	<unitRef unit="sf_adaptation_stubs_simatk_tsy_stub"/>
+    	<unitRef unit="sf_os_cellularsrv_telephonyserverplugins_licenseetsystub"/>
     	<unitRef unit="sf_adaptation_stubs_audiostubs"/>
     	<unitRef unit="sf_adaptation_stubs_wlanhwinit_stub"/>
 			<unitRef unit="sf_adaptation_stubs_systemswstubs"/>