--- a/foundation/sysdefs/system_model.xml	Fri Aug 07 11:47:33 2009 +0100
+++ b/foundation/sysdefs/system_model.xml	Fri Aug 07 12:19:55 2009 +0100
@@ -2992,6 +2992,133 @@
    </block>
   </layer>
   <layer name="mw" long-name="Middleware" levels="generic specific">
+   <block name="accesssec" long-name="Access Security" tech_domain="se" level="generic" levels="plugin framework server generic specific">
+    <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
+     <component name="wapisecuritysettingsui" long-name="WAPI Security Settings UI" origin-model="foundation">
+      <unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
+     </component>
+     <component name="wepsecuritysettingsui" long-name="WEP Security Eettings UI" origin-model="foundation">
+      <unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
+     </component>
+     <component name="wifiprotectedsetup" long-name="WIFI Protected Setup" origin-model="foundation">
+      <unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
+     </component>
+     <component name="wlaneapsettingsui" long-name="WLAN EAP Settings UI" origin-model="foundation">
+      <unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
+     </component>
+     <component name="wpasecuritysettingsui" long-name="WPA Security Settings UI" origin-model="foundation">
+      <unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
+     </component>
+     <component unofficial="yes" name="wlansecuritysettings_build" long-name="WLAN Security Settings Build" origin-model="foundation">
+      <unit bldFile="mw/accesssec/wlansecuritysettings/group"/>
+     </component>
+    </collection>
+    <collection name="eapol" long-name="EAPOL" level="framework">
+     <component name="eapol_framework" long-name="EAPOL Framework" origin-model="foundation">
+      <unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
+     </component>
+     <component unofficial="yes" name="eapol_build" long-name="EAPOL Build" origin-model="foundation">
+      <unit bldFile="mw/accesssec/eapol/group"/>
+     </component>
+    </collection>
+    <collection name="accesssec_info" long-name="Access Security Info" level="specific">
+     <component unofficial="yes" name="accesssec_plat" long-name="Access Security Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/accesssec/accesssec_plat/group"/>
+     </component>
+     <component unofficial="yes" name="accesssec_build" long-name="Access Security Build" origin-model="foundation">
+      <unit bldFile="mw/accesssec/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="appinstall" long-name="Application Installation" tech_domain="rt" level="generic" levels="tool framework generic api">
+    <collection name="appinstaller" long-name="App Installer" level="generic">
+     <component name="appmngr2" long-name="App Mngr2" origin-model="foundation">
+      <unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
+     </component>
+     <component name="appinstui" long-name="App Installer UI" origin-model="foundation">
+      <unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
+     </component>
+     <component unofficial="yes" name="appinstaller_build" long-name="App Installer Build" origin-model="foundation">
+      <unit bldFile="mw/appinstall/appinstaller/group"/>
+     </component>
+    </collection>
+    <collection name="ncdengine" long-name="NCD Engine" level="framework">
+     <component name="ncdengine_engine" long-name="Engine" origin-model="foundation">
+      <unit bldFile="mw/appinstall/ncdengine/engine/group"/>
+     </component>
+     <component name="debuglogger" long-name="Debug Logger" origin-model="foundation">
+      <!-- <unit bldFile="mw/appinstall/ncdengine/debuglogger/group"/> -->
+     </component>
+     <component unofficial="yes" name="ncdengine_build" long-name="NCD Engine Build" origin-model="foundation">
+      <unit bldFile="mw/appinstall/ncdengine/group"/>
+     </component>
+    </collection>
+    <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
+     <component name="iaupdateapi_stub_build" origin-model="foundation">
+      <unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
+     </component>
+    </collection>
+    <collection name="iaupdate" long-name="IA Update" level="api">
+     <component name="iad" origin-model="foundation">
+      <unit bldFile="mw/appinstall/iaupdate/iad/group"/>
+     </component>
+     <component name="iaupdate_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="mw/appinstall/iaupdate/help/group"/>
+     </component>
+     <component unofficial="yes" name="iaupdate_build" long-name="IA Update Build" origin-model="foundation">
+      <unit bldFile="mw/appinstall/iaupdate/group"/>
+     </component>
+    </collection>
+    <collection name="appinstall_info" long-name="Application Installation Info" level="api">
+     <component unofficial="yes" name="appinstall_pub" long-name="Application Installation Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/appinstall/appinstall_pub/group"/>
+      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
+      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
+     </component>
+     <component unofficial="yes" name="appinstall_test" long-name="Application Installation Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/appinstall/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="appinstall_plat" long-name="Application Installation Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
+      <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
+      <unit bldFile="mw/appinstall/appinstall_plat/group"/>
+     </component>
+    <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+     </component>
+    </collection>
+	<!-- Collection manually added due to faulty merge XSLT -->
+	<collection name="installationservices" long-name="Installation Services" level="generic">
+	 <component name="swi" long-name="Secure Software Install" purpose="optional">
+	  <unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+	 </component>
+	 <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+	  <unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+	 </component>
+	 <component name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
+	  <unit bldFile="mw/appinstall/installationservices/switestfw/group" mrp="mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
+	 </component>
+	 <component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+	  <unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+	 </component>
+	</collection>
+    <collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="swisistools">
+       -  <unit bldFile="mw/appinstall/secureswitools/swisistools/test/tinterpretsisinteg/tintsistef"/>  -
+      </component>-->
+    <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+     </component>
+     <component name="n:swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/> -->
+     </component>
+     <component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+     </component>
+    </collection>
+   </block>
    <block name="appsupport" long-name="Generic Application Support" tech_domain="rt" level="generic" levels="system plugin framework server generic specific">
     <collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
      <component name="oodmonitor" long-name="OOD Monitor" origin-model="foundation">
@@ -3262,2803 +3389,6 @@
      </component>
     </collection>
    </block>
-   <block name="securitysrv" long-name="Security Services" tech_domain="se" level="generic" levels="plugin framework server generic specific">
-    <collection name="gba" long-name="Generic Boot Architecture" level="specific">
-     <component name="uicc" long-name="Uicc" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/gba/uicc/group"/>
-     </component>
-     <component name="bootstrap" long-name="Bootstrap" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/gba/bootstrap/group"/>
-     </component>
-     <component name="gbaserver" long-name="GBA Server" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
-     </component>
-     <component name="gbaapi" long-name="GBA API" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
-     </component>
-     <component name="gbafilter" long-name="GBA Filter" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
-     </component>
-     <component unofficial="yes" name="gba_build" long-name="Generic Boot Architecture Build" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/gba/group"/>
-     </component>
-    </collection>
-    <collection name="wim" long-name="WIM" level="framework">
-     <component name="swimreader" long-name="Swim Reader" origin-model="foundation"/>
-     <component name="scard" long-name="S Card" origin-model="foundation"/>
-     <component name="wimutil" long-name="WIM Util" origin-model="foundation"/>
-     <component name="wimserver" long-name="WIM Server" origin-model="foundation"/>
-     <component name="wimclient" long-name="WIM Client" origin-model="foundation"/>
-     <component name="wimplugin" long-name="WIM Plugin" origin-model="foundation"/>
-     <component unofficial="yes" name="wim_build" long-name="WIM Build" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/wim/group"/>
-     </component>
-    </collection>
-    <collection name="cms" long-name="Certificate Management Services" level="generic">
-     <component name="cms_build" long-name="CMS" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/cms/group"/>
-     </component>
-    </collection>
-    <collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-     <component name="x509certnameparser" long-name="X509cert Name Parser" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-     </component>
-     <component name="pkcs12" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
-     </component>
-     <component name="certmanui" long-name="Certman UI" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
-     </component>
-     <component name="ctsecuritydialogs" long-name="CT Security Dialogs" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-     </component>
-     <component name="certsaver" long-name="Cert Saver" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
-     </component>
-     <component name="secmodui" long-name="Sec Mod UI" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
-     </component>
-     <component name="devicetoken" long-name="Device Token" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
-     </component>
-     <component name="certificates" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/pkiutilities/certificates/group"/>
-     </component>
-     <component name="certificates_oem" origin-model="foundation"/>
-     <component unofficial="yes" name="pkiutilities_build" long-name="PKI Utilities Build" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/pkiutilities/group"/>
-     </component>
-    <component name="ocsp" long-name="Online Certificate Status Protocol" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-     </component>
-    </collection>
-    <collection name="remotelock" long-name="Remote Lock" level="server">
-     <component name="remotelocksettings" long-name="Remote Lock Settings" origin-model="foundation"/>
-     <component name="remotelockengine" long-name="Remote Lock Engine" origin-model="foundation"/>
-     <component unofficial="yes" name="remotelock_build" long-name="Remote Lock Build" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/remotelock/group"/>
-     </component>
-    </collection>
-    <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-     <component name="trkdummy" long-name="Trk Dummy" origin-model="foundation">
-      <!-- <unit bldFile="mw/securitysrv/boottimeintegritycheck/trkdummy/group"/> -->
-     </component>
-     <component unofficial="yes" name="boottimeintegritycheck_build" long-name="Boot Time Integrity Check Build" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
-     </component>
-    </collection>
-    <collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-     <component name="keylockpolicyapi" long-name="Keylock Policy Api" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-     </component>
-     <component name="autolock" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
-     </component>
-     <component name="secui" long-name="Sec UI" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
-     </component>
-     <component name="securitynotifier" long-name="Security Notifier" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
-     </component>
-     <component name="securityobserver" long-name="Security Observer" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/securitydialogs/securityobserver/group"/>
-     </component>
-     <component unofficial="yes" name="securitydialogs_build" long-name="Security Dialogs Build" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/securitydialogs/group"/>
-     </component>
-    </collection>
-    <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-     <component unofficial="yes" name="securitysrv_build" long-name="Security Services Build" origin-model="foundation">
-      <unit bldFile="mw/securitysrv/group"/>
-     </component>
-     <component unofficial="yes" name="secsrv_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/> -->
-      <unit bldFile="mw/securitysrv/secsrv_plat/group"/>
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/> -->
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="securitysrv_test" long-name="Security Services Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/securitysrv/tsrc/group"/> -->
-     </component>
-    <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="drm" long-name="DRM" tech_domain="se" level="generic" levels="plugin framework server generic specific">
-    <collection name="commondrm" long-name="Common DRM" level="generic">
-     <component name="drmencryptor" long-name="DRM Encryptor" origin-model="foundation"/>
-     <component name="drmsettingsplugin" long-name="DRM Settings Plugin" origin-model="foundation"/>
-     <component name="drmrightsmanagerui" long-name="DRM Rights Manager UI" origin-model="foundation">
-      <unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-     </component>
-     <component name="drmutility" long-name="DRM Utility" origin-model="foundation">
-      <unit bldFile="mw/drm/commondrm/drmutility/group"/>
-     </component>
-     <component name="drmserviceapiwrapper" long-name="DRM Service API Wrapper" origin-model="foundation">
-      <unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
-     </component>
-     <component name="drmrightsstoringlocation" long-name="DRM Rights Storing Location" origin-model="foundation">
-      <unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
-     </component>
-     <component unofficial="yes" name="commondrm_build" long-name="Common DRM Build" origin-model="foundation">
-      <unit bldFile="mw/drm/commondrm/group"/>
-     </component>
-    </collection>
-    <collection name="omadrm" long-name="OMA DRM" level="server">
-     <component name="drmroapwbxmlparser" long-name="DRM ROAP WBXML Parser" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/omadrm/drmroapwbxmlparser/group"/> -->
-     </component>
-     <component name="drmplugins" long-name="DRM Plugins" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmfilter/group"/> -->
-      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmrecognizer/group"/> -->
-      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmrohandler/group"/> -->
-      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmromtm/group"/> -->
-     </component>
-     <component name="drmengine" long-name="DRM Engine" origin-model="foundation"/>
-     <component name="drmhelper" long-name="DRM Helper" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/omadrm/drmhelper/drmhelperserver/group"/> -->
-      <!-- <unit bldFile="mw/drm/omadrm/drmhelper/group"/> -->
-     </component>
-     <component name="drmlicensemanager" long-name="Drm License Manager" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/omadrm/drmlicensemanager/group"/> -->
-     </component>
-     <component unofficial="yes" name="omadrm_build" long-name="OMA DRM Build" origin-model="foundation">
-      <unit bldFile="mw/drm/omadrm/group"/>
-     </component>
-    </collection>
-    <collection name="wmdrm" long-name="WM DRM" level="framework">
-     <component name="wmdrmengine" long-name="WM DRM Engine" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmagent/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/client/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/server/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/client/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/clientwrapper/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/server/group"/> -->
-     </component>
-     <component name="camese" long-name="Camese" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/cameseutility/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/httpfiltercamese/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdla/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlaapp/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdladefaulthttpplugin/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdladefaultuiplugin/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlautils/group"/> -->
-      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlawrapper/group"/> -->
-     </component>
-     <component name="wmdrmplugins" long-name="WM DRM Plugins" origin-model="foundation"/>
-     <component unofficial="yes" name="wmdrm_build" long-name="WM DRM Build" origin-model="foundation">
-      <unit bldFile="mw/drm/wmdrm/group"/>
-     </component>
-    </collection>
-    <collection name="drm_info" long-name="DRM Info" level="specific">
-     <component unofficial="yes" name="drm_pub" long-name="DRM Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/tsrc/group"/> -->
-      <unit bldFile="mw/drm/drm_pub/group"/>
-      <!-- <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="drm_plat" long-name="DRM Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
-      <unit bldFile="mw/drm/drm_plat/group"/>
-      <!-- <unit bldFile="mw/drm/drm_plat/roap_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="drm_build" long-name="DRM Build" origin-model="foundation">
-      <unit bldFile="mw/drm/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="accesssec" long-name="Access Security" tech_domain="se" level="generic" levels="plugin framework server generic specific">
-    <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-     <component name="wapisecuritysettingsui" long-name="WAPI Security Settings UI" origin-model="foundation">
-      <unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-     </component>
-     <component name="wepsecuritysettingsui" long-name="WEP Security Eettings UI" origin-model="foundation">
-      <unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-     </component>
-     <component name="wifiprotectedsetup" long-name="WIFI Protected Setup" origin-model="foundation">
-      <unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-     </component>
-     <component name="wlaneapsettingsui" long-name="WLAN EAP Settings UI" origin-model="foundation">
-      <unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-     </component>
-     <component name="wpasecuritysettingsui" long-name="WPA Security Settings UI" origin-model="foundation">
-      <unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-     </component>
-     <component unofficial="yes" name="wlansecuritysettings_build" long-name="WLAN Security Settings Build" origin-model="foundation">
-      <unit bldFile="mw/accesssec/wlansecuritysettings/group"/>
-     </component>
-    </collection>
-    <collection name="eapol" long-name="EAPOL" level="framework">
-     <component name="eapol_framework" long-name="EAPOL Framework" origin-model="foundation">
-      <unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-     </component>
-     <component unofficial="yes" name="eapol_build" long-name="EAPOL Build" origin-model="foundation">
-      <unit bldFile="mw/accesssec/eapol/group"/>
-     </component>
-    </collection>
-    <collection name="accesssec_info" long-name="Access Security Info" level="specific">
-     <component unofficial="yes" name="accesssec_plat" long-name="Access Security Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/accesssec/accesssec_plat/group"/>
-     </component>
-     <component unofficial="yes" name="accesssec_build" long-name="Access Security Build" origin-model="foundation">
-      <unit bldFile="mw/accesssec/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="locationsrv" long-name="Location Services" tech_domain="lo" level="specific" levels="plugins fw interface">
-    <collection name="landmarks" long-name="Landmarks" level="fw">
-     <component name="locationlandmarks" long-name="Location Landmarks" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
-     </component>
-     <component unofficial="yes" name="landmarks_build" long-name="Landmarks Build" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/landmarks/group"/>
-     </component>
-    </collection>
-    <collection name="locationmapnavfw" long-name="Location Map Nav Framework" level="fw">
-     <component name="library" long-name="Library" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-     </component>
-     <component name="aiwprovider" long-name="Application Inter-Working Provider" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-     </component>
-     <component unofficial="yes" name="locationmapnavfw_build" long-name="Location Map Nav Framework Build" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-     </component>
-    </collection>
-    <collection name="locationsystemui" long-name="Location System UI" level="interface">
-     <component name="locationsysui" long-name="Location Sys UI" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
-     </component>
-     <component unofficial="yes" name="locationsystemui_build" long-name="Location System UI Build" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationsystemui/group"/>
-     </component>
-    </collection>
-    <collection name="supl" long-name="SUPL" level="plugins">
-     <component name="locationsuplfw" long-name="Location SUPL Framework" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
-     </component>
-     <component name="locationomasuplprotocolhandler" long-name="Location OMA SUPL Protocol Handler" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-     </component>
-     <component name="locationomasuplpostester" long-name="Location OMA SUPL Pos Tester" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/supl/locationomasuplpostester/group"/>
-     </component>
-     <component unofficial="yes" name="supl_build" long-name="SUPL Build" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/supl/group"/>
-     </component>
-    </collection>
-    <collection name="locationtriggering" long-name="Location Triggering" level="interface">
-     <component name="ltlogger" long-name="LT Logger" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
-     </component>
-     <component name="ltclientlib" long-name="LT Client Lib" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
-     </component>
-     <component name="ltmanagementlib" long-name="LT Management Library" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-     </component>
-     <component name="ltcontainer" long-name="LT Container" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
-     </component>
-     <component name="ltserver" long-name="LT Server" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
-     </component>
-     <component name="ltstrategypluginapi" long-name="LT Strategy Plugin API" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-     </component>
-     <component name="ltstrategyengine" long-name="LT Strategy Engine" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-     </component>
-     <component name="ltmovementdetectionpluginapi" long-name="Movement Detection Plugin API" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-     </component>
-     <component name="ltcellidmovementdetector" long-name="Cell ID Movement Detector" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-     </component>
-     <component name="lbtmgmtui" long-name="LBT Management UI" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-     </component>
-     <component unofficial="yes" name="locationtriggering_test" long-name="Location Triggering Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreatetest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/createtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/handlingprocesstest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity2_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancellisttriggerstest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/createtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity4_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelgettriggerstest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/modifytest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity5_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelsettriggerstest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/canceldeletetest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/deletetest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
-     </component>
-     <component unofficial="yes" name="locationtriggering_build" long-name="Location Triggering Build" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/locationtriggering/group"/>
-     </component>
-    </collection>
-    <collection name="locationsrv_info" long-name="Location Services Info" level="interface">
-     <component unofficial="yes" name="locsrv_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="genericpositioningplugins" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
-     </component>
-     <component unofficial="yes" name="locationsrv_test" long-name="Location Services Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/locationsrv/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="locationsrv_build" long-name="Location Services Build" origin-model="foundation">
-      <unit bldFile="mw/locationsrv/group"/>
-     </component>
-     <component unofficial="yes" name="locsrv_pub" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block name="ipconnmgmt" long-name="IP Connectivity Management" tech_domain="dc" level="generic" levels="plugin framework server generic utils">
-    <collection name="alwayson_net_plugin" long-name="Always On Net Plugin" level="server">
-     <component name="pdpcontextmanager2" long-name="PDP Context Manager 2" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-     </component>
-     <component unofficial="yes" name="alwayson_net_plugin_build" long-name="Always On Net Plugin Build" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/group"/>
-     </component>
-    </collection>
-    <collection name="bearermanagement" long-name="Bearer Management" level="framework">
-     <component name="mpm" long-name="MPM" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
-     </component>
-     <component name="bearermanager" long-name="Bearer Manager" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/bearermanagement/bearermanager/group"/>
-     </component>
-     <component unofficial="yes" name="bearermanagement_build" long-name="Bearer Management Build" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/bearermanagement/group"/>
-     </component>
-    </collection>
-    <collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-     <component name="connectionmonitorplugin" long-name="Connection Monitor Plugin" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-     </component>
-     <component name="connectionmonitorui" long-name="Connection Monitor UI" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-     </component>
-     <component name="connmon" long-name="Connection Monitor" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-     </component>
-     <component name="connmonext" long-name="Connection Monitor Ext" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-     </component>
-     <component unofficial="yes" name="connectionmonitoring_build" long-name="Connection Monitoring Build" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/group"/>
-     </component>
-    </collection>
-    <collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-     <component name="apcontrollistplugin" long-name="Access Point Control List Plugin" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-     </component>
-    </collection>
-    <collection name="apengine" long-name="Application Engine" level="framework">
-     <component name="apeng" long-name="Access Point Engine" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
-     </component>
-     <component name="apsettingshandlerui" long-name="Access Point Settings Handler UI" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-     </component>
-     <component name="apsettingsplugin" long-name="Access Point Settings Plugin" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-     </component>
-     <component unofficial="yes" name="apengine_build" long-name="Application Engine Build" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/apengine/group"/>
-     </component>
-    </collection>
-    <collection name="cmmanager" long-name="CM Manager" level="framework">
-     <component name="cmmgr" long-name="CM Manager" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-     </component>
-    </collection>
-    <collection name="dbcreator" long-name="DB Creator" level="utils">
-     <component name="commsdatcreator" long-name="Comms Database Creator" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-     </component>
-     <component name="commsdatcreatorrfsplugin" long-name="Comms Database Creator RFS Pluginr" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
-     </component>
-     <component name="commsdatstartup" long-name="Comms Database Startup" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-     </component>
-     <component name="dbcreatorexe" long-name="DB Creator" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-     </component>
-     <component unofficial="yes" name="dbcreator_build" long-name="DB Creator Build" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
-     </component>
-    </collection>
-    <collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-     <component name="connectiondialogs" long-name="ConnectionDialogs" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-     </component>
-    </collection>
-    <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-     <component unofficial="yes" name="ipconnmgmt_build" long-name="IP Connectivity Management Build" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/group"/>
-     </component>
-     <component unofficial="yes" name="ipcm_pub" class="api" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/group"/>
-     </component>
-     <component unofficial="yes" name="ipcm_plat" class="api" origin-model="foundation">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="netprotocols" long-name="High-level Internet Protocols" tech_domain="dc" level="generic" levels="plugin framework server generic specific">
-    <collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-     <component name="httpfiltercommon" long-name="HTTP Filter Common" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-     </component>
-     <component name="cookie" long-name="Cookie" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
-     </component>
-     <component name="deflatefilter" long-name="Deflate Filter" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
-     </component>
-     <component name="httpfilteracceptheader" long-name="HTTP Filter Accept Header" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-     </component>
-     <component name="httpfilterauthentication" long-name="HTTP Filter Authentication" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-     </component>
-     <component name="httpfilterconnhandler" long-name="HTTP Filter Conn Handler" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-     </component>
-     <component name="httpfilteriop" long-name="HTTP Filter Iop" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
-     </component>
-     <component name="httpfilterproxy" long-name="HTTP Filter Proxy" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-     </component>
-     <component name="uaproffilter" long-name="UAProf Filter" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
-     </component>
-     <component unofficial="yes" name="httpfilters_build" long-name="HTTP Filters Build" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/httpfilters/group"/>
-     </component>
-    </collection>
-    <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-     <component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-     </component>
-     <component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-     </component>
-     <component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-     </component>
-     <component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-     </component>
-     <component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-     </component>
-     <component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-     </component>
-    </collection>
-    <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-     <component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-     </component>
-     <component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-     </component>
-     <component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-     </component>
-     <component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-     </component>
-    </collection>
-    <collection name="n:wapstack" long-name="WAP Stack" level="plugin">
-     <component name="n:wapmessageapi" long-name="WAP Message API" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/netprotocols/wapstack/wapmessageapi/group" mrp="mw/netprotocols/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-     <component unofficial="yes" name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
-     </component>
-     <component unofficial="yes" name="netprotocols_build" long-name="High-level Internet Protocols Build" origin-model="foundation">
-      <unit bldFile="mw/netprotocols/group"/>
-     </component>
-    <component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="ipappprotocols" long-name="IP App Protocols" tech_domain="dc" level="generic" levels="plugin framework conn server">
-    <collection name="rtp" long-name="RTP" level="server">
-     <component name="srtpstack" long-name="SRTP Stack" origin-model="foundation">
-      <unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
-      <!-- <unit bldFile="mw/ipappprotocols/rtp/srtpstack/tsrc/ut_srtpstack/group"/> -->
-     </component>
-     <component name="rtpstack" long-name="RTP Stack" origin-model="foundation">
-      <unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
-      <!-- <unit bldFile="mw/ipappprotocols/rtp/rtpstack/tsrc/ut_rtpstack/group"/> -->
-     </component>
-    </collection>
-    <collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-     <component name="sippwlanplugin" long-name="SIP WLAN Plugin" origin-model="foundation">
-      <unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-     </component>
-     <component name="sippsipsettingsui" long-name="SIP Settings UI" origin-model="foundation">
-      <unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/tsrc/ut_sipsettingsui/group"/> -->
-     </component>
-     <component name="sippdevmgmtsipadapter" long-name="Device Management SIP Adapter" origin-model="foundation">
-      <unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/tsrc/ut_cnsmldmsipadapter/group"/> -->
-     </component>
-     <component name="sippsystemstatemonitor" long-name="SIP System State Monitor" origin-model="foundation">
-      <unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-     </component>
-     <component name="sippsipadapter" long-name="SIP Adapter" origin-model="foundation">
-      <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/tsrc/ut_cwpsipadapter/group"/> -->
-     </component>
-    </collection>
-    <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
-     <component name="rtp" long-name="RTP" introduced="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- Real Time Data Protocol -->
-      <unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-     </component>
-     <component name="sipfw" long-name="SIP Framework" introduced="9.2" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-     </component>
-    </collection>
-    <collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-     <component name="sipprovider" long-name="SIP Provider" introduced="tb91" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-     </component>
-    </collection>
-    <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="server">
-     <component unofficial="yes" name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/group"/>
-     </component>
-     <component unofficial="yes" name="ipappprotocols_build" long-name="IP App Protocols Build" origin-model="foundation">
-      <unit bldFile="mw/ipappprotocols/group"/>
-     </component>
-    <component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="wirelessacc" long-name="Wireless Access" tech_domain="dc" level="specific" levels="framework generic ui">
-    <collection name="hotspotfw" long-name="Hotspot Framework" level="framework">
-     <component name="hsserver" long-name="HotSpot Server" origin-model="foundation"/>
-     <component name="hsclient" long-name="HS Client" origin-model="foundation"/>
-     <component name="internetconnectivitytestservice" long-name="Internet Connectivity Test Service" origin-model="foundation">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/internetconnectivitytestservice/group"/> -->
-     </component>
-     <component name="ictsdialogs" long-name="ICTS Dialogs" origin-model="foundation">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/ictsdialogs/group"/> -->
-     </component>
-     <component name="hspluginforagent" long-name="HotSpot Plugin For Agent" origin-model="foundation">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hspluginforagent/group"/> -->
-     </component>
-     <component name="hsbrowser" long-name="HotSpot Browser" origin-model="foundation">
-      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hsbrowser/group"/> -->
-     </component>
-     <component unofficial="yes" name="hotspotfw_build" long-name="Hotspot Framework Build" origin-model="foundation">
-      <unit bldFile="mw/wirelessacc/hotspotfw/group"/>
-     </component>
-    </collection>
-    <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-     <component name="wlanplugin" long-name="WLAN Plugin" origin-model="foundation">
-      <unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-     </component>
-     <component name="wlansettingsui" long-name="WLAN Settings UI" origin-model="foundation">
-      <unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-     </component>
-     <component name="wlansniffer" long-name="WLAN Sniffer" origin-model="foundation">
-      <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-     </component>
-     <component name="wlanindicatorplugin" long-name="WLAN Indicator Plugin" origin-model="foundation">
-      <unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-     </component>
-     <component unofficial="yes" name="wlanutilities_build" long-name="WLAN Utilities Build" origin-model="foundation">
-      <unit bldFile="mw/wirelessacc/wlanutilities/group"/>
-     </component>
-    </collection>
-    <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
-     <component unofficial="yes" name="hsfw_plat" class="api" origin-model="foundation">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/group"/>
-     </component>
-     <component unofficial="yes" name="wirelessacc_build" long-name="Wireless Access Build" origin-model="foundation">
-      <unit bldFile="mw/wirelessacc/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="vpnclient" long-name="VPN Client" tech_domain="dc" level="specific" levels="engine ui api">
-    <collection name="vpnclient_sis" long-name="VPN Client Sis" level="api">
-     <component name="ce_sis" long-name="CE SIS" origin-model="foundation">
-      <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/ce_sis/group"/> -->
-     </component>
-     <component name="stub_sis" long-name="Stub Sis" origin-model="foundation">
-      <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/stub_sis/group"/> -->
-     </component>
-     <component unofficial="yes" name="vpnclient_sis_build" origin-model="foundation">
-      <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/group"/> -->
-     </component>
-    </collection>
-    <collection name="vpnengine" long-name="VPN Engine" level="engine">
-     <component name="eventmediatorapi" long-name="Event Mediator API" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-     </component>
-     <component name="eventviewer" long-name="Event Viewer" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-     </component>
-     <component name="vpnins" long-name="VPN Ins" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-     </component>
-     <component name="acuagenttransport" long-name="ACU Agent Transport" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/acuagenttransport/group"/>
-     </component>
-     <component name="acupluginlib" long-name="ACU Plugin Lib" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/acupluginlib/group"/>
-     </component>
-     <component name="ikepolparser" long-name="IKE Policy Parser" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-     </component>
-     <component name="utlbase64" long-name="UTL Base64" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-     </component>
-     <component name="utlcrypto" long-name="UTL Crypto" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-     </component>
-     <component name="utlxml" long-name="UTL XML" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-     </component>
-     <component name="utlpkcs10" long-name="UTL PKCS10" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-     </component>
-     <component name="pkiserviceapi" long-name="PKI Service API" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-     </component>
-     <component name="acuagentcrypto" long-name="ACU Agent Crypto" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/acuagentcrypto/group"/>
-     </component>
-     <component name="vpnextapi" long-name="VPN Ext. API" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/vpnextapi/group"/>
-     </component>
-     <component name="ikecert" long-name="Ike Cert" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-     </component>
-     <component name="kmdapi" long-name="KMD API" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-     </component>
-     <component name="kmdserver" long-name="Kmd Server" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-     </component>
-     <component name="ikeutils" long-name="IKE Utils" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-     </component>
-     <component name="ikev1lib" long-name="Ikev1 Library" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-     </component>
-     <component name="ikev2lib" long-name="Ikev2 Library" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-     </component>
-     <component name="acuagentmessage" long-name="ACU Agent Message" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/acuagentmessage/group"/>
-     </component>
-     <component name="acuagent" long-name="ACU Agent" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/acuagent/group"/>
-     </component>
-     <component name="vpnawapi" long-name="VPN AW API" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/vpnawapi/group"/>
-     </component>
-     <component name="vpnipsecpolparser" long-name="VPN Ipsecpolparser" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-     </component>
-     <component name="sit" long-name="Sit" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-     </component>
-     <component name="acuins" long-name="ACU INS" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/acuins/group"/>
-     </component>
-     <component name="vpntcwrapper" long-name="VP NTC Wrapper" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-     </component>
-     <component name="eventmediator" long-name="Event Mediator" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-     </component>
-     <component name="ipsecacuplugin" long-name="IPseca Cu Plugin" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/ipsecacuplugin/group"/>
-     </component>
-     <component name="pkiservice" long-name="PKI Service" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-     </component>
-     <component name="vpnconnagt" long-name="VPN Connagt" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-     </component>
-     <component name="vpnmanager" long-name="VPN Manager" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-     </component>
-     <component name="vpncleaner" long-name="VPN Cleaner" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-     </component>
-     <component name="utlpkcs12" long-name="UTL PKCS12" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-     </component>
-     <component name="dmadengine" long-name="DM Adapter Engine" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-     </component>
-     <component name="dmadipsecvpn" long-name="DM Adapter IPsec VPN" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-     </component>
-     <component name="dmadpki" long-name="DM Adapter PKI" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-     </component>
-     <component name="ikesocketplugin" long-name="IKE Socket Plugin" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnengine/ikesocketplugin/group"/>
-     </component>
-     <component name="vpnnif" long-name="VPN NIF" origin-model="foundation"/>
-    </collection>
-    <collection name="vpnui" long-name="VPN UI" level="ui">
-     <component name="vpnecomnotifier" long-name="VPN ECOM Notifier" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-     </component>
-     <component name="vpndialogmanager" long-name="VPN Dialog Manager" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-     </component>
-     <component name="vpnmanagementui" long-name="VPN Management UI" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group"/>
-     </component>
-     <component name="vpnpolins" long-name="VPN Policy Ins" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-     </component>
-     <component name="vpnpolicyrecognizer" long-name="VPN Policy Recognizer" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-     </component>
-    </collection>
-    <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-     <component name="vpnapi" long-name="VPN API" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
-     </component>
-    </collection>
-    <collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-     <component unofficial="yes" name="vpnclient_help" long-name="VPN Client Help" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/help/group"/>
-     </component>
-     <component unofficial="yes" name="vpnclient_build" long-name="VPN Client Build" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/group"/>
-     </component>
-     <component unofficial="yes" name="vpnc_plat" class="api" origin-model="foundation">
-      <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="ipappsrv" long-name="IP App Services" tech_domain="vc" level="specific" levels="framework  generic server  conn plugin">
-    <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-     <component name="mmccinterface" long-name="MMCC Interface" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccinterface/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccinterface/tsrc/ut_interface/group"/> -->
-     </component>
-     <component name="mmccjitterbuffer" long-name="Jitter Buffer" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/tsrc/ut_jitterbuffer/group"/> -->
-     </component>
-     <component name="mmccqoscontroller" long-name="QoS Controller" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/tsrc/ut_qoscontroller/group"/> -->
-     </component>
-     <component name="mmccmultiplexer" long-name="MMCC Multiplexer" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/tsrc/ut_multiplexer/group"/> -->
-     </component>
-     <component name="mmccsubcontroller" long-name="MMCC Subcontroller" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_rtpmediaclock/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/group"/> -->
-     </component>
-     <component name="mmcccontroller" long-name="MMCC Controller" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcccontroller/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcccontroller/tsrc/ut_controller/group"/> -->
-     </component>
-     <component name="mmccredpayloadformat" long-name="RED Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/tsrc/ut_redpayloadformat/group"/> -->
-     </component>
-     <component name="mmccamrpayloadformat" long-name="AMR Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/tsrc/ut_amrpayloadformat/group"/> -->
-     </component>
-     <component name="mmccg711payloadformat" long-name="G711 Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/tsrc/ut_g711payloadformat/group"/> -->
-     </component>
-     <component name="mmccg729payloadformat" long-name="G729 Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/tsrc/ut_g729payloadformat/group"/> -->
-     </component>
-     <component name="mmccilbcpayloadformat" long-name="ILBC Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/tsrc/ut_ilbcpayloadformat/group"/> -->
-     </component>
-     <component name="mmccdtmfpayloadformat" long-name="DTMF Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/tsrc/ut_dtmfpayloadformat/group"/> -->
-     </component>
-     <component name="mmccrtpsourcesink" long-name="RTP Source Sink" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/group"/> -->
-     </component>
-     <component name="mmccvideosourcesink" long-name="Video Source Sink" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/tsrc/ut_videosourcesink/group"/> -->
-     </component>
-     <component name="mmcch263payloadformat" long-name="H263 Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/tsrc/ut_h263payloadformat/group"/> -->
-     </component>
-     <component name="mmccanypayloadformat" long-name="ANY Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/tsrc/ut_anypayloadformat/group"/> -->
-     </component>
-     <component name="mmccfilesourcesink" long-name="MMCC File Source Sink" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/tsrc/ut_filesourcesink/group"/> -->
-     </component>
-     <component name="mmccanysourcesink" long-name="Anysource Sink" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/tsrc/ut_anysourcesink/group"/> -->
-     </component>
-     <component name="mmccavcpayloadformat" long-name="AVC Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/tsrc/ut_avcpayloadformat/group"/> -->
-     </component>
-     <component unofficial="yes" name="multimediacommscontroller_build" long-name="Multimedia Comms Controller Build" origin-model="foundation">
-      <unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
-     </component>
-     <component unofficial="yes" name="multimediacommscontroller_test" long-name="Multimedia Comms Controller Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/dptests/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/clienttests/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/componenttests/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/subcontrollerstub/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/jitterbuffertestconsole/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/rtpsourcesink/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpconsole/group"/> -->
-     </component>
-    </collection>
-    <collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-     <component name="mmcecli" long-name="MMCE Client" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcecli/group"/> -->
-     </component>
-     <component name="mmcefloorctrlengine" long-name="MMCE Foor Control Engine" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin2/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/group"/> -->
-     </component>
-     <component name="mmcefloorctrlplugin" long-name="MMCE Foor Control Plugin" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/tsrc/ut_floorctrlplugin/group"/> -->
-     </component>
-     <component name="mmcesrv" long-name="MMCE Server" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/sip_stub/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmcemediamanager/tsrc/ut_mediamanager/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceserver/tsrc/ut_server/group"/> -->
-     </component>
-     <component unofficial="yes" name="multimediacommsengine_build" long-name="Multimedia Comms Engine Build" origin-model="foundation">
-      <unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
-     </component>
-     <component unofficial="yes" name="multimediacommsengine_test" long-name="Multimedia Comms Engine Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/ttcnresolverplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiengine/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group/s60_public_sdk"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="natfw" long-name="NAT Framework" level="framework">
-     <component name="natfwsettings" long-name="NAT Framework Settings" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsettings/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsettings/tsrc/ut_cnatfwnatsettings/group"/> -->
-     </component>
-     <component name="natfwconnectionmultiplexer" long-name="NAT Framework Connection Multiplexer" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/muxtestconsole/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/ut_connectionmultiplexer/group"/> -->
-     </component>
-     <component name="natfwclient" long-name="NAT Framework Client" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwclient/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwclient/tsrc/ut_natfwclient/group"/> -->
-     </component>
-     <component name="natfwsocketmediaconnwrapper" long-name="Socket Media Connection Wrapper" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/tsrc/ut_socketmediaconnwrapper/group"/> -->
-     </component>
-     <component name="natfwunsaf_protocols" long-name="NAT Framework Unsaf Protocols" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_codec/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_transport/group"/> -->
-     </component>
-     <component name="natfwstunturnclient" long-name="NAT Framework Stun Turn Client" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunturnclient/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunturnclient/tsrc/ut_stunturnclient/group"/> -->
-     </component>
-     <component name="natfwstunserver" long-name="NAT Framework Stun Server" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunserver/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunserver/tsrc/ut_cnatfwstunsrv/group"/> -->
-     </component>
-     <component name="natfwicecandidatehandler" long-name="NAT Framework Ice Candidate Handler" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwicecandidatehandler/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group"/> -->
-     </component>
-     <component name="natfwstunplugin" long-name="NAT Framework STUN Plugin" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunplugin/tsrc/ut_cnatfwstunplugin/group"/> -->
-     </component>
-     <component name="natfwturnplugin" long-name="NAT Framework TURN Plugin" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwturnplugin/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwturnplugin/tsrc/ut_cnatfwturnplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="natfw_build" long-name="NAT Framework Build" origin-model="foundation">
-      <unit bldFile="mw/ipappsrv/natfw/group"/>
-     </component>
-     <component unofficial="yes" name="natfw_test" long-name="NAT Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/ipappsrv/natfw/tsrc/natfwtestconsoles/natfwtestconsole/group"/> -->
-     </component>
-    </collection>
-    <collection name="natplugins" long-name="NAT Plugins" level="plugin">
-     <component name="natpcliprovisioningnatfwadapter" long-name="Client Provisioning NAT Framework Traversal Adapter" origin-model="foundation">
-      <unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/tsrc/t_natfwtraversaladapter/group"/> -->
-     </component>
-     <component name="natpdevmgmtnatfwadapter" long-name="Device Management NAT Framework Traversal Adapter" origin-model="foundation">
-      <unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/tsrc/ut_cnsmldmnatfwtraversaladapter/group"/> -->
-     </component>
-     <component name="natptraversalcontroller" long-name="NAT Traversal Controller" origin-model="foundation">
-      <unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/tsrc/ut_nattraversalcontroller/group"/> -->
-     </component>
-     <component name="natpnatfwsdpprovider" long-name="NAT Framework SDP Provider" origin-model="foundation">
-      <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/testconsole/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/ut_natfwsdpprovider/group"/> -->
-     </component>
-    </collection>
-    <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-     <component unofficial="yes" name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="ipappsrv_build" long-name="IP App Services Build" origin-model="foundation">
-      <unit bldFile="mw/ipappsrv/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="phonesrv" long-name="Telephony and SIM Services" tech_domain="vc" level="specific" levels="plugin framework server generic specific">
-    <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-     <component name="phonecmdhnlr" long-name="Phone Command Handler" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-     </component>
-    </collection>
-    <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-     <component name="cbsserver" long-name="CBS Server" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
-     </component>
-     <component name="cbsui" long-name="CBS UI" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
-     </component>
-    </collection>
-    <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-     <component name="callprovider" long-name="Call Provider" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
-     </component>
-     <component name="cce" long-name="CCE" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
-     </component>
-     <component name="spsettings" long-name="SP Settings" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
-      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
-     </component>
-     <component name="cenrepdatabase" long-name="Cenrep Database" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-     </component>
-     <component name="serviceselector" long-name="Service Selector" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
-     </component>
-     <component name="csplugin" long-name="CS Plugin" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
-     </component>
-     <component unofficial="yes" name="convergedcallengine_build" long-name="Converged Call Engine Build" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/convergedcallengine/group"/>
-     </component>
-    </collection>
-    <collection name="networkhandling" long-name="Network Handling" level="plugin">
-     <component name="networkhandlingengine" long-name="Network Handling Engine" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-     </component>
-    </collection>
-    <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-     <component name="enpolicy" long-name="En Policy" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
-     </component>
-     <component name="aiwdialdata" long-name="AIW Dial Data" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
-     </component>
-     <component name="dialutils" long-name="Dial Utils" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
-     </component>
-     <component name="phoneclient" long-name="Phone Client" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
-     </component>
-     <component name="phoneserver" long-name="Phones Erver" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
-     </component>
-     <component name="callui" long-name="Call UI" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
-     </component>
-    </collection>
-    <collection name="satengine" long-name="Sat Engine" level="generic">
-     <component name="satserver" long-name="Sat Server" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/satengine/satserver/group"/>
-     </component>
-     <component unofficial="yes" name="satengine_build" long-name="Sat Engine Build" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/satengine/group"/>
-     </component>
-    </collection>
-    <collection name="satui" long-name="Sat UI" level="specific">
-     <component name="satapp" long-name="Sat App" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/satui/satapp/group"/>
-     </component>
-     <component name="satplugin" long-name="Sat Plugin" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/satui/satplugin/group"/>
-     </component>
-     <component unofficial="yes" name="satui_build" long-name="Sat UI Build" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/satui/group"/>
-     </component>
-    </collection>
-    <collection name="telutils" long-name="Utilities" level="generic">
-     <component name="phoneparser" long-name="Phone Parser" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
-     </component>
-     <component name="telephonyservice" long-name="Telephony Service" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
-     </component>
-    </collection>
-    <collection name="cellular" long-name="Cellular" level="server">
-     <component name="telephonysettings" long-name="Telephony Settings" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
-     </component>
-     <component name="sssettings" long-name="SS Settings" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
-     </component>
-     <component name="psetnotesui" long-name="Pset Notes UI" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
-     </component>
-     <component name="servicerequest" long-name="Service Request" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
-     </component>
-    </collection>
-    <collection name="engines" long-name="Telephony Engines" level="specific">
-     <component name="vmbxengine" long-name="Voice Mailbox Engine" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
-     </component>
-    </collection>
-    <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
-     <component unofficial="yes" name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
-      <unit bldFile="mw/phonesrv/phonesrv_plat/group"/>
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="phonesrv_pub" long-name="Telephony and SIM Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/phonesrv_pub/group"/>
-     </component>
-     <component unofficial="yes" name="phonesrv_build" long-name="Telephony and SIM Services Build" origin-model="foundation">
-      <unit bldFile="mw/phonesrv/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="messagingmw" long-name="Messaging Middleware" tech_domain="pr" level="specific" levels="stack fw api">
-    <collection name="msgbranched" long-name="Messaging Branched" level="fw">
-     <component name="msgbranched_build" origin-model="foundation">
-      <unit bldFile="mw/messagingmw/msgbranched/group"/>
-     </component>
-    </collection>
-    <collection name="messagingfw" long-name="Messaging FW" level="fw">
-     <component name="alwaysonline" long-name="Always Online" origin-model="foundation">
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/alwaysonlinemanager/group"/> -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/alwaysonlinestarterapp/group"/> -->
-      <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
-     </component>
-     <component name="msgcommonutils" long-name="Messaging Common Utils" origin-model="foundation">
-      <unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
-     </component>
-     <component name="senduiservices" long-name="Send UI Services" origin-model="foundation">
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/datautils/group"/> -->
-      <unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/launcher/group"/> -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/serviceresolver/group"/> -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/watcher/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="scheduledsendmtm">
-       <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendexe/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendmtm/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/test/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="msgsrvnstore">
-       <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/group"/>
-       -  <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/test/group"/>  -
-       <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/server/group"/>
-       -  <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/server/test/testrom"/>  -
-       <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/serverexe/group"/>
-     </component>-->
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="biomsgfw">
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bdb"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bifu"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bioc"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bios"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/biowatchers"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bits"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/biut"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/cbcp"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/enp"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/gfp"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/iacp"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/rom"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/t_biomsg/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/wapp"/>
-     </component>-->
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="msgconf"/>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="watcherfw">
-       <unit bldFile="mw/messagingmw/messagingfw/watcherfw/test/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="msgtest">
-       <unit bldFile="mw/messagingmw/messagingfw/msgtest/integration/group"/>
-       -  <unit bldFile="mw/messagingmw/messagingfw/msgtest/targetautomation"/>  -
-       <unit bldFile="mw/messagingmw/messagingfw/msgtest/testsuites/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/msgtest/testutils/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/msgtest/tools/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="biowatchers">
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmanbswatcher/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmasocketwatcher/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatchervmn/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwemt/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwmt/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwpt/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/test/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="sendas">
-       <unit bldFile="mw/messagingmw/messagingfw/sendas/client/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/sendas/editutils/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/sendas/server/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/sendas/test/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="msgurlhandler">
-       <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/test/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/urlhandler/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="wappushfw">
-       -  <unit bldFile="mw/messagingmw/messagingfw/wappushfw/examples/pushapphandlerex"/>  -
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/miscpushmsgutils/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/plugins/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/plugins/wapurilookup/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushmsgentry/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushmtm/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushutils/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushwatcher/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/roaptcontenthandler/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/rocontenthandler/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/rom"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/sislcontenthandlers/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/sislpushmsgutils/group"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpush"/>
-       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpushscriptbased"/>
-     </component>-->
-     <component name="suplsmshandler" origin-model="foundation"/>
-     <component name="suplwappushhandler" origin-model="foundation"/>
-    <component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-     </component>
-     <component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-     </component>
-     <component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-     </component>
-     <component name="msgconf" long-name="Messaging Config" introduced="tb91" purpose="optional" class="config" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-     </component>
-     <component name="watcherfw" long-name="Watcher Framework" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-     </component>
-     <component name="msgtest" long-name="Messaging Test" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-     </component>
-     <component name="msgtests" long-name="Messaging Tests" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/messagingmw/messagingfw/msgtests/group/messaging.mrp"/>
-     </component>
-     <component name="msgtestfw" long-name="Messaging Test Framework" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/messagingmw/messagingfw/msgtestfw/group/messaging_testframework.mrp"/>
-     </component>
-     <component name="msgtestproduct" long-name="Messaging Test Product" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/messagingmw/messagingfw/msgtestproduct/group/messaging_testproduct.mrp"/>
-     </component>
-     <component name="biowatchers" long-name="BIO Watchers" introduced="8.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="mw/messagingmw/messagingfw/biowatchers/Group" mrp="mw/messagingmw/messagingfw/biowatchers/Group/messaging_biomsg_biowatchers_cdma.mrp"/>
-     </component>
-     <component name="sendas" long-name="Send As" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-     </component>
-     <component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-     </component>
-     <component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-     </component>
-     <component name="n:suplsmshandler" long-name="SUPL SMS Handler" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/> -->
-     </component>
-     <component name="n:suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-     <component unofficial="yes" name="msgfw_pub" class="api" origin-model="foundation">
-      <unit bldFile="mw/messagingmw/msgfw_pub/group"/>
-      <!-- <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/> -->
-      <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="messagingmw_build" long-name="Messaging Middleware Build" origin-model="foundation">
-      <unit bldFile="mw/messagingmw/group"/>
-     </component>
-     <component unofficial="yes" name="msgfw_plat" class="api" origin-model="foundation">
-      <unit bldFile="mw/messagingmw/msgfw_plat/group"/>
-      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/tsrc/group"/>
-     </component>
-    <component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="imsrv" long-name="Instant Messaging and Presence Services" tech_domain="pr" level="specific" levels="plugin framework server generic specific">
-    <collection name="imservices" long-name="IM Services" level="generic">
-     <component name="imfeatureplugin" long-name="IM Feature Plugin" origin-model="foundation">
-      <unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimdatamodel/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimfrontend/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimoperations/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimprocessor/group"/> -->
-     </component>
-     <component name="searchfeatureplugin" long-name="Search Feature Plugin" origin-model="foundation">
-      <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchdatamodel/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchfrontend/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchoperations/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchprocessor/group"/> -->
-     </component>
-     <component name="xmppsettingsapi" long-name="XMPP Setting Sapi" origin-model="foundation">
-      <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/tsrc/group"/> -->
-     </component>
-     <component name="xmppsettingsfetcher" long-name="XMPP Settingsfetcher" origin-model="foundation">
-      <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
-     </component>
-     <component name="ossprotocoladaptation" long-name="OSS Protocol Adaptation" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/> -->
-      <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
-     </component>
-     <component name="instantmessagingcache" long-name="Instant Messaging Cache" origin-model="foundation">
-      <unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/instantmessagingcache/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="imservices_build" long-name="IM Services Build" origin-model="foundation">
-      <unit bldFile="mw/imsrv/imservices/group"/>
-     </component>
-    </collection>
-    <collection name="ximpfw" long-name="XIMP Framework" level="framework">
-     <component name="ximpfw_core" long-name="Core" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/ximpfw/core/group"/> -->
-     </component>
-     <component name="presence" long-name="Presence" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/ximpfw/presence/group"/> -->
-     </component>
-     <component unofficial="yes" name="ximpfw_test" long-name="XIMP Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcutils"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_rootservices"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceall"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_sessionmng"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_eunittemplate"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_utils"/> -->
-     </component>
-     <component unofficial="yes" name="ximpfw_build" long-name="XIMP Framework Build" origin-model="foundation">
-      <unit bldFile="mw/imsrv/ximpfw/group"/>
-     </component>
-    </collection>
-    <collection name="brandingserver" long-name="Branding Server" level="specific">
-     <component name="tools" long-name="Tools" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/brandingserver/tools/bsimport/group"/> -->
-     </component>
-     <component unofficial="yes" name="brandingserver_build" long-name="Branding Server Build" origin-model="foundation">
-      <unit bldFile="mw/imsrv/brandingserver/group"/>
-     </component>
-    </collection>
-    <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
-     <component unofficial="yes" name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/imsrv/imsrv_plat/group"/>
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="imsrv_build" long-name="Instant Messaging and Presence Services Build" origin-model="foundation">
-      <unit bldFile="mw/imsrv/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="legacypresence" long-name="Legacy Presence Services" tech_domain="pr" level="specific" levels="engine fw ui">
-    <collection name="xdmengine" long-name="XDM Engine" level="engine">
-     <component name="xdmsettingsapi" long-name="XDM Settings Api" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmsettingsapi/group"/> -->
-     </component>
-     <component name="xdmprovisioning" long-name="XDM Provisioning" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmprovisioning/group"/> -->
-     </component>
-     <component name="xdmdevicemanagement" long-name="XDM Device Management" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmdevicemanagement/group"/> -->
-     </component>
-     <component name="xdmengine_build" long-name="XDM Engine" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/xdmengine/group"/>
-     </component>
-    </collection>
-    <collection name="xdmsettingsui" long-name="XDM Settings UI" level="ui">
-     <component name="xdmsettingsui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/xdmsettingsui/help/group"/>
-     </component>
-     <component unofficial="yes" name="xdmsettingsui_build" long-name="XDM Settings UI Build" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/xdmsettingsui/group"/>
-     </component>
-    </collection>
-    <collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-     <component name="msgconnmanager_build" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/msgconnmanager/group"/>
-     </component>
-    </collection>
-    <collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptor" level="fw">
-     <component name="simpleplugin" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
-     </component>
-    </collection>
-    <collection name="presencesettingsui" long-name="Presence Settings UI" level="ui">
-     <component name="presencesettingsui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/presencesettingsui/help/group"/>
-     </component>
-     <component unofficial="yes" name="presencesettingsui_build" long-name="Presence Settings UI Build" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/presencesettingsui/group"/>
-     </component>
-    </collection>
-    <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
-     <component name="presencesettingsapi" long-name="Presence Settings API" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/presencesettingsapi/group"/> -->
-     </component>
-     <component name="siputils" long-name="SIP Utils" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/siputils/group"/> -->
-     </component>
-     <component name="xmlutils" long-name="XML Utils" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/xmlutils/group"/> -->
-     </component>
-     <component name="simpleengine_engine" long-name="Engine" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/engine/group"/> -->
-     </component>
-     <component name="xdmrlspres" long-name="XDM Rlspres" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/xdmrlspres/group"/> -->
-     </component>
-     <component name="presencedm" long-name="Presence DM" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/presencedm/group"/> -->
-     </component>
-     <component name="presenceprovisioning" long-name="Presence Provisioning" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/simpleengine/presenceprovisioning/group"/> -->
-     </component>
-     <component unofficial="yes" name="simpleengine_build" long-name="SIMPLE Engine Build" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/simpleengine/group"/>
-     </component>
-    </collection>
-    <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
-     <component name="xdmxmlparser" long-name="XDM XML Parser" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xdmxmlparser/group"/> -->
-     </component>
-     <component name="xcapprotocol" long-name="Xcap Protocol" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapappusage/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/client/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/server/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcaphttptransport/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapoperations/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcaputils/group"/> -->
-     </component>
-     <component name="localprotocol" long-name="Local Protocol" origin-model="foundation">
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/group"/> -->
-      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/localoperations/group"/> -->
-     </component>
-     <component unofficial="yes" name="xdmprotocols_build" long-name="XDM Protocols Build" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/xdmprotocols/group"/>
-     </component>
-    </collection>
-    <collection name="simpledatamodeladapter" long-name="SIMPLE Data Mode Aadapter" level="fw">
-     <component name="presenceplugin" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
-     </component>
-    </collection>
-    <collection name="legacypresence_info" long-name="Legacy Presence Services Info" level="ui">
-     <component unofficial="yes" name="pressrv_plat" class="api" origin-model="foundation">
-      <unit bldFile="mw/legacypresence/pressrv_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="opensrv" long-name="Open Services" tech_domain="rt" level="specific" levels="prt lib server eng">
-    <collection name="loudmouth" long-name="Loudmouth" level="prt">
-     <component name="loudmouth_build" origin-model="foundation">
-      <unit bldFile="mw/opensrv/loudmouth/group"/>
-     </component>
-     <component unofficial="yes" name="loudmouth_test" long-name="Loudmouth Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/opensrv/loudmouth/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-     <component name="libtelepathy_build" origin-model="foundation">
-      <unit bldFile="mw/opensrv/libtelepathy/group"/>
-     </component>
-     <component unofficial="yes" name="libtelepathy_test" long-name="Telepathy Library Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/opensrv/libtelepathy/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-     <component unofficial="yes" name="telepathygabble_build" long-name="Telepathy Gabble Build" origin-model="foundation">
-      <unit bldFile="mw/opensrv/telepathygabble/group"/>
-     </component>
-    </collection>
-    <collection name="isolationserver" long-name="Isloation Server" level="server">
-     <component name="messagequeue" long-name="Message Queue" origin-model="foundation">
-      <unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-     </component>
-     <component name="isoserver" long-name="ISO Server" origin-model="foundation">
-      <unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-     </component>
-     <component unofficial="yes" name="isolationserver_test" long-name="Isloation Server Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/opensrv/isolationserver/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="isolationserver_build" long-name="Isloation Server Build" origin-model="foundation">
-      <unit bldFile="mw/opensrv/isolationserver/group"/>
-     </component>
-    </collection>
-    <collection name="opensrv_info" long-name="Open Services Info" level="eng">
-     <component unofficial="yes" name="opensrv_plat" long-name="Open Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/opensrv/opensrv_plat/group"/>
-      <!-- <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="opensrv_build" long-name="Open Services Build" origin-model="foundation">
-      <unit bldFile="mw/opensrv/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="remotemgmt" long-name="Remote Management" tech_domain="dm" level="specific" levels="plugin framework server generic specific">
-    <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-     <component name="pnputil" long-name="PnP Util" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
-     </component>
-     <component name="provisioning" long-name="provisioning" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/tsrc/moduletest/group"/> -->
-     </component>
-    </collection>
-    <collection name="policymanagement" long-name="Policy Management" level="generic">
-     <component name="pmdmadapter" long-name="PMDM Adapter" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-     </component>
-     <component name="dmutilserver" long-name="DM Util Server" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
-     </component>
-     <component name="policyengine" long-name="Polic Eengine" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
-     </component>
-     <component unofficial="yes" name="policymanagement_build" long-name="Policy Management Build" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/policymanagement/group"/>
-     </component>
-    </collection>
-    <collection name="syncmlfw" long-name="SyncML Framework" level="server">
-     <component name="syncmlfw_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/alerthandler/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/alertqueue/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/debug/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/historylog/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/http/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/inc"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/inc/modifiedheaders"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/inc/policy"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/inc/symbianheaders"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/notifiers/inc"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexclient/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexcommserver/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexdmplugin/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexdsplugin/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexserverbinding/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver_clientapi/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver_privateapi/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver_transporthandler/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/syncagent/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/transport/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/wbxml/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/common/xml/bld"/>
-     </component>
-     <component name="ds" long-name="DS" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/adapterlog/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/adapters/dataproviderbase/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/agentlog/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/alerthandler/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/changefinder/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/dbcaps/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/filter/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/filterutils/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/profileutil/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/storeformat/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/hostserver/dshostclient/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/hostserver/dshostserverbase/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/hostserver/dshostservers/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/inc"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/netmon/bld"/>
-      <!-- <unit bldFile="mw/remotemgmt/syncmlfw/ds/ota/bld"/> -->
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/provisioningadapter/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/settings/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/syncagent/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/ds/wappushalert/bld"/>
-     </component>
-     <component name="dm" long-name="DM" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/callbackserver/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/dmutils/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/hostserver/dmhostserverbase/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/hostserver/dmhostservers/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/provisioningadapter/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/settings/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/syncagent/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/treedbclient/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/treedbhandler/bld"/>
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/treemodule/bld"/>
-      <!-- <unit bldFile="mw/remotemgmt/syncmlfw/dm/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/syncmlfw/dm/wappushalert/bld"/>
-     </component>
-     <component name="syncmlnotifier" long-name="SyncML Notifier" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/syncmlfw/syncmlnotifier/group"/>
-     </component>
-     <component name="syncservice" long-name="Sync Service" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/syncmlfw/syncservice/group"/>
-     </component>
-     <component unofficial="yes" name="syncmlfw_build" long-name="SyncML Framework Build" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/syncmlfw/group"/>
-     </component>
-    </collection>
-    <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-     <component name="scp" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-      <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-      <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-      <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-      <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-     </component>
-     <component name="terminalsecurity_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
-     </component>
-     <component name="terminalsecurity_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
-     </component>
-     <component name="tcadapter" long-name="TC Adapter" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-     </component>
-     <component unofficial="yes" name="terminalsecurity_build" long-name="Terminal Security Build" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
-     </component>
-    </collection>
-    <collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-     <component name="diagframework" long-name="Diagnostics Framework" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-     </component>
-     <component name="diagpluginbase" long-name="Diagnostics Plugin Base" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-     </component>
-     <component name="diagresultsdb" long-name="Diagnostics Results DB" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-     </component>
-     <component unofficial="yes" name="devicediagnosticsfw_build" long-name="Device Diagnostics Framework Build" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
-     </component>
-    </collection>
-    <collection name="n:remotemgmttest" long-name="Remote Management Test" level="specific">
-     <component name="n:omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/> -->
-     </component>
-     <component name="n:omadevicemgmtintegrationtest" long-name="OMA Device Management Integration Test" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:syncandremotemgmtfw" long-name="Sync and Remote Management Framework" level="framework">
-     <component name="n:omasyncmldatasync" long-name="OMA SyncML Data Sync" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/> -->
-     </component>
-     <component name="n:omasyncmlcommonfw" long-name="OMA SyncML Common Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/> -->
-     </component>
-     <component name="n:omasyncmldminterface" long-name="OMA SyncML DM Interface" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/> -->
-     </component>
-     <component name="n:omasyncmlconfig" long-name="OMA SyncML Config" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/> -->
-     </component>
-     <component name="n:devicemgmtfw" long-name="Device Management Framework" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/> -->
-     </component>
-     <component name="n:clientprovisioningfw" long-name="Client Provisioning Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:syncandremotemgmtservices" long-name="Sync and Remote Management Services" level="plugin">
-     <component name="n:datasyncadaptors" long-name="Data Sync Adaptors" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/> -->
-     </component>
-     <component name="n:devicemgmtadaptors" long-name="Device Management Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/> -->
-     </component>
-     <component name="n:clientprovisioningadaptors" long-name="Client Provisioning Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
-     <component unofficial="yes" name="remotemgmt_build" long-name="Remote Management Build" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/group"/>
-     </component>
-     <component unofficial="yes" name="remotemgmt_pub" long-name="Remote Management Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/remotemgmt/remotemgmt_pub/group"/>
-     </component>
-     <component unofficial="yes" name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/group"/>
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
-     </component>
-    <component name="n:remotemgmt_metadata" long-name="Remote Management Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/remotemgmt/remotemgmt_info/remotemgmt_metadata/remotemgmt_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="networkingdm" long-name="Networking Device Management" tech_domain="dm" level="generic" levels="plugin framework server generic specific">
-    <collection name="clientprovisioning" long-name="Client Provisioning" level="specific">
-     <component name="accesspointadapter" long-name="Access Point Adapter" origin-model="foundation">
-      <unit bldFile="mw/networkingdm/clientprovisioning/accesspointadapter/group"/>
-     </component>
-     <component name="cpdestinationnwadapter" long-name="CP Destination NW Adapter" origin-model="foundation">
-      <unit bldFile="mw/networkingdm/clientprovisioning/cpdestinationnwadapter/group"/>
-     </component>
-     <component unofficial="yes" name="clientprovisioning_build" long-name="Client Provisioning Build" origin-model="foundation">
-      <unit bldFile="mw/networkingdm/clientprovisioning/group"/>
-     </component>
-    </collection>
-    <collection name="devicemanagement" long-name="Device Management" level="specific">
-     <component name="globalwlansettings" long-name="Global WLAN Settings" origin-model="foundation">
-      <unit bldFile="mw/networkingdm/devicemanagement/globalwlansettings/group"/>
-     </component>
-     <component name="nsmldinternet" long-name="NSMLD Internet" origin-model="foundation">
-      <unit bldFile="mw/networkingdm/devicemanagement/nsmldinternet/group"/>
-     </component>
-     <component name="nsmldmalwaysonadapter" long-name="Nsmldm Always On Adapter" origin-model="foundation">
-      <unit bldFile="mw/networkingdm/devicemanagement/nsmldmalwaysonadapter/group"/>
-     </component>
-     <component name="nsmldmbmadapter" long-name="NSMLDM BM Adapter" origin-model="foundation">
-      <unit bldFile="mw/networkingdm/devicemanagement/nsmldmbmadapter/group"/>
-     </component>
-     <component unofficial="yes" name="devicemanagement_build" long-name="Device Management Build" origin-model="foundation">
-      <unit bldFile="mw/networkingdm/devicemanagement/group"/>
-     </component>
-    </collection>
-    <collection name="networkingdm_info" long-name="Networking Device Management Info" level="specific">
-     <component unofficial="yes" name="networkingdm_build" long-name="Networking Device Management Build" origin-model="foundation">
-      <unit bldFile="mw/networkingdm/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="remotestorage" long-name="Remote Storage" tech_domain="de" level="generic" levels="framework">
-    <collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-     <component name="mountstore" long-name="Mount Store" origin-model="foundation">
-      <unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
-     </component>
-     <component name="rsfwnotifierplugins" long-name="RS Framework Notifier Plugins" origin-model="foundation">
-      <unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-     </component>
-     <component name="remotefileengine" long-name="Remote File Engine" origin-model="foundation">
-      <unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-     </component>
-     <component name="mountmanager" long-name="Mount Manager" origin-model="foundation">
-      <unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
-      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="webdavaccessplugin" long-name="WebDAV Access Plugin" origin-model="foundation">
-      <unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-     </component>
-     <component name="remotefilesystemplugin" long-name="Remote Filesystem Plugin" origin-model="foundation">
-      <unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-     </component>
-     <component name="remotestoragegsplugin" long-name="GS Plugin" origin-model="foundation">
-      <unit bldFile="mw/remotestorage/remotestoragefw/gsplugin/group"/>
-     </component>
-     <component name="remotedriveconfigurationbiocontrol" long-name="Remote Drive Configuration BIO Control" origin-model="foundation">
-      <unit bldFile="mw/remotestorage/remotestoragefw/remotedriveconfigurationbiocontrol/group"/>
-     </component>
-     <component unofficial="yes" name="remotestoragefw_build" long-name="Remote Storage Framework Build" origin-model="foundation">
-      <unit bldFile="mw/remotestorage/remotestoragefw/group"/>
-     </component>
-    </collection>
-    <collection name="remotestorage_info" long-name="Remote Storage Info" level="framework">
-     <component unofficial="yes" name="rsfw_plat" class="api" origin-model="foundation">
-      <unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="remoteconn" long-name="Remote Connectivity" tech_domain="de" level="generic" levels="plugin framework server generic specific">
-    <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-     <component name="secon" long-name="Se Con" origin-model="foundation">
-      <unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
-     </component>
-    </collection>
-    <collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-     <component unofficial="yes" name="remoteconn_build" long-name="Remote Connectivity Build" origin-model="foundation">
-      <unit bldFile="mw/remoteconn/group"/>
-     </component>
-     <component unofficial="yes" name="remoteconn_plat" long-name="Remote Connectivity Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/remoteconn/remoteconn_plat/group"/>
-     </component>
-    <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-     </component>
-     <component name="n:connectivitydoc" long-name="Connectivity Documentation" introduced="tb91" purpose="optional" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/remoteconn/remoteconn_info/connectivitydoc/group/connectivity_documentation.mrp"/>
-     </component>
-     <component name="n:mtpdoc" long-name="MTP Documentation" introduced="tb91" purpose="optional" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/remoteconn/remoteconn_info/mtpdoc/group/mtp_documentation.mrp"/>
-     </component>
-    </collection>
-   <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
-     <component name="n:mrouter" long-name="m-Router" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remoteconn/connectivitytransports/mrouter/group" mrp="mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/> -->
-     </component>
-     <component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/group" mrp="mw/remoteconn/connectivitytransports/plpremotelink/group/connectivity_legacy_plp_plpremotelink.mrp"/>
-     </component>
-     <component name="plpvariant" long-name="PLP Variant" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/connectivitytransports/plpvariant/group" mrp="mw/remoteconn/connectivitytransports/plpvariant/group/connectivity_legacy_plp_plpvariant.mrp"/>
-     </component>
-     <component name="eventbroadcast" long-name="Event Broadcast" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/connectivitytransports/eventbroadcast/group" mrp="mw/remoteconn/connectivitytransports/eventbroadcast/group/connectivity_legacy_brdcst.mrp"/>
-     </component>
-    </collection>
-    <collection name="mtptransports" long-name="MTP Transports" level="plugin">
-     <component name="mtpusbtransport" long-name="MTP USB Transport" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-     </component>
-    </collection>
-    <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-     <component name="n:mtpfw" long-name="MTP Framework" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/> -->
-     </component>
-     <component name="mtpintegrationtest" long-name="MTP Integration Test" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/mtpfws/mtpintegrationtest/group" mrp="mw/remoteconn/mtpfws/mtpintegrationtest/group/mtp_test.mrp"/>
-     </component>
-    </collection>
-    <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-     <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-     </component>
-     <component name="n:mtpwmpextndp" long-name="WMP Extension Data Provider" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/remoteconn/mtpdataproviders/mtpwmpextndp/group" mrp="mw/remoteconn/mtpdataproviders/mtpwmpextndp/group/mtp_wmpextndp.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-     <component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-     </component>
-     <component name="backuptest" long-name="Backup Test" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-     </component>
-    </collection>
-    <collection name="connectivitypcside" long-name="Connectivity PC Side" level="generic">
-     <component name="chatscripts" long-name="Chat Scripts" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/connectivitypcside/chatscripts/group" mrp="mw/remoteconn/connectivitypcside/chatscripts/group/testtools_chatscripts.mrp"/>
-     </component>
-     <component name="n:connectqi" long-name="ConnectQI" introduced="9.1" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/remoteconn/connectivitypcside/connectqi/connectqisdk_mr3.mrp"/>
-     </component>
-     <component name="n:connectqisdk" long-name="ConnectQI SDK" introduced="9.1" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/remoteconn/connectivitypcside/connectqisdk/connectqisdk_public.mrp"/>
-     </component>
-    </collection>
-    <collection name="connectivitydevicefws" long-name="Connectivity Device Frameworks" level="framework">
-     <component name="connectivityfw" long-name="Connectivity Framework" introduced="7.0s" deprecated="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/connectivitydevicefws/connectivityfw/group" mrp="mw/remoteconn/connectivitydevicefws/connectivityfw/group/connectivity_framework.mrp"/>
-     </component>
-     <component name="connectivityservices" long-name="Connectivity Services" introduced="7.0s" deprecated="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/remoteconn/connectivitydevicefws/connectivityservices/group" mrp="mw/remoteconn/connectivitydevicefws/connectivityservices/group/connectivity_services.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="dlnasrv" long-name="DLNA Services" tech_domain="de" level="specific" levels="framework server plugin">
-    <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-     <component name="avcontrolframework" long-name="A/V Control Famework" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-     </component>
-     <component name="avcpengine" long-name="AVCP Engine" origin-model="foundation"/>
-     <component name="avcpengineclient" long-name="Avcp Engine Client" origin-model="foundation"/>
-     <component name="upnpaccessplugin" long-name="UPnP Access Plugin" origin-model="foundation"/>
-     <component unofficial="yes" name="upnpavcontrolpoint_build" long-name="UPnP A/V Control Point Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
-     </component>
-    </collection>
-    <collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-     <component name="avobjects" long-name="A/V Objects" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-     </component>
-     <component name="mediaserverclient" long-name="Media Server Client" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-     </component>
-     <component name="connectionmanagerservice" long-name="Connection Manager Service" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-     </component>
-     <component name="contentdirectoryservice" long-name="Content Directory Service" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-     </component>
-     <component name="mediaserverengine" long-name="Media Server Engine" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-     </component>
-     <component unofficial="yes" name="upnpmediaserver_build" long-name="UPnP Media Server Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
-     </component>
-    </collection>
-    <collection name="upnpstack" long-name="UPnP Stack" level="framework">
-     <component name="upnputils" long-name="UPnP Utils" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpstack/upnputils/group"/>
-     </component>
-     <component name="upnpconnectionmanagersession" long-name="UPnP Connection Manager Session" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpstack/upnpconnectionmanagersession/group"/>
-     </component>
-     <component name="upnpconnmanager" long-name="UPnP Connection Manager" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpstack/upnpconnmanager/group"/>
-     </component>
-     <component name="dlnawebserver" long-name="DLNA Web Server" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpstack/dlnawebserver/group"/>
-     </component>
-     <component name="serviceframework" long-name="Service Framework" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpstack/serviceframework/group"/>
-     </component>
-     <component name="ssdpserver" long-name="SSDP Server" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpstack/ssdpserver/group"/>
-     </component>
-     <component name="messagehandler" long-name="Message Handler" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpstack/messagehandler/group"/>
-     </component>
-     <component name="controlpointbase" long-name="Control Point Base" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpstack/controlpointbase/group"/>
-     </component>
-     <component name="upnphttptransfer" long-name="UPnP HTTP Transfer" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpstack/upnphttptransfer/group"/>
-     </component>
-     <component unofficial="yes" name="upnpstack_build" long-name="UPnP Stack Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpstack/group"/>
-     </component>
-    </collection>
-    <collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-     <component name="upnpdlnaprofiler" long-name="UPnP DLNA Profiler" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-     </component>
-     <component name="upnpsecurity" long-name="UPnP Security" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-     </component>
-     <component name="upnpcontentserver" long-name="UPnP Content Server" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-     </component>
-     <component name="applicationengine" long-name="Application Engine" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
-     </component>
-     <component unofficial="yes" name="upnpsharing_build" long-name="UPnP Sharing Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsharing/group"/>
-     </component>
-    </collection>
-    <collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-     <component name="upnpsettingsengine" long-name="UPnP Settings Engine" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-     </component>
-     <component name="multiselectionui" long-name="Multi-Selection UI" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsettings/multiselectionui/group"/>
-     </component>
-     <component name="appwizard" long-name="App Wizard" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsettings/appwizard/group"/>
-     </component>
-     <component name="upnpsharingui" long-name="UPnP Sharing UI" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
-     </component>
-     <component name="upnpgsplugin" long-name="UPnP GS Plugin" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-     </component>
-     <component unofficial="yes" name="upnpsettings_build" long-name="UPnP Settings Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpsettings/group"/>
-     </component>
-    </collection>
-    <collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-     <component name="upnpplaybackplugins" long-name="UPnP Playback Plugins" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-     </component>
-     <component unofficial="yes" name="upnpmpxplugins_build" long-name="UPnP MPX Plugins Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
-     </component>
-    </collection>
-    <collection name="upnpharvester" long-name="UPnP Harvester" level="server">
-     <component name="upnpharvester_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
-      <unit bldFile="mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
-      <unit bldFile="mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
-      <unit bldFile="mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
-     </component>
-     <component name="cdssync" long-name="CDS Sync" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpharvester/cdssync/common"/>
-     </component>
-     <component name="mdhserver" long-name="MDH Server" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpharvester/mdhserver/group"/>
-     </component>
-     <component unofficial="yes" name="upnpharvester_build" long-name="UPnP Harvester Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpharvester/group"/>
-     </component>
-    </collection>
-    <collection name="upnpframework" long-name="UPnP Framework" level="framework">
-     <component name="upnputilities" long-name="UPnP Utilities" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
-     </component>
-     <component name="upnpextensionpluginif" long-name="UPnP Extension Plugin IF" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
-     </component>
-     <component name="upnpfiletransferengine" long-name="UPnP File Transfer Engine" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
-     </component>
-     <component name="upnpmusicadapter" long-name="UPnP Musicadapter" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-     </component>
-     <component name="upnpcommonui" long-name="UPnP Common UI" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpframework/upnpcommonui/group"/>
-     </component>
-     <component name="upnpcommand" long-name="UPnP Command" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
-     </component>
-     <component name="upnpaiwengine" long-name="UPnP AIW Engine" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
-     </component>
-     <component name="upnpaiwprovider" long-name="UPnP AIW Provider" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
-     </component>
-     <component unofficial="yes" name="upnpframework_build" long-name="UPnP Framework Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpframework/group"/>
-     </component>
-    </collection>
-    <collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="server">
-     <component name="upnpxmlparser" long-name="UPnP XML Parser" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-     </component>
-     <component name="upnpavcontrollerserver" long-name="UPnP A/V Controller Server" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-     </component>
-     <component name="upnpavcontrollerclient" long-name="UPnP A/V Ccontroller Client" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-     </component>
-     <component name="upnpavcontrollerhelper" long-name="UPnP A/V Controller Helper" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-     </component>
-     <component unofficial="yes" name="upnpavcontroller_build" long-name="UPnP A/V Controller Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
-     </component>
-    </collection>
-    <collection name="homesync" long-name="Home Sync" level="plugin">
-     <component name="contentmanager" long-name="Content Manager" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmfillmanager/group"/>
-      <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmmemorymanager/group"/>
-      <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmscheduler/group"/>
-      <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmserver/group"/>
-      <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmstoremanager/group"/>
-      <unit bldFile="mw/dlnasrv/homesync/contentmanager/homesyncgsplugin/group"/>
-      <unit bldFile="mw/dlnasrv/homesync/contentmanager/homesyncwizard/group"/>
-      <unit bldFile="mw/dlnasrv/homesync/contentmanager/mediaservant/applicationengine/group"/>
-      <unit bldFile="mw/dlnasrv/homesync/contentmanager/mediaservant/group"/>
-     </component>
-     <component unofficial="yes" name="homesync_build" long-name="Home Sync Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/homesync/group"/>
-     </component>
-    </collection>
-    <collection name="homemedia" long-name="Home Media" level="framework">
-     <component name="homemedia_build" long-name="Home Media" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/homemedia/group"/>
-     </component>
-     
-    </collection>
-    <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-     <component unofficial="yes" name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="dlnasrv_build" long-name="DLNA Services Build" origin-model="foundation">
-      <unit bldFile="mw/dlnasrv/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="shortlinkconn" long-name="Shortlink Connectivity" tech_domain="de" level="generic" levels="framework server generic specific plugin">
-    <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-     <component name="bteng" long-name="Bluetooth Engine" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/bteng/group"/>
-     </component>
-     <component name="btnotif" long-name="Bluetooth Notifier" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/btnotif/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->
-     </component>
-     <component name="btaudioman" long-name="Bluetooth Audio Man" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudioman/group"/>
-     </component>
-     <component name="btmac" long-name="Bluetooth Mac" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/btmac/group"/>
-     </component>
-     <component name="btsac" long-name="Bluetooth SAC" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/btsac/group"/>
-     </component>
-     <component name="btaudiostreamer" long-name="Bluetooth Audio Streamer" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudiostreamer/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudiostreamer/tsrc/btaudiostreamerapitest/group"/> -->
-     </component>
-     <component name="btsap" long-name="Bluetooth SAP" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/btsap/group"/>
-     </component>
-     <component name="btui" long-name="Bluetooth UI" origin-model="foundation">
-      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/ecom/group"/> -->
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/group"/>
-     </component>
-     <component name="btpbap" long-name="Bluetooth PBAP" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/btpbap/group"/>
-     </component>
-     <component name="bthid" long-name="BTHID" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/group"/>
-     </component>
-     <component unofficial="yes" name="bluetoothengine_build" long-name="Bluetooth Engine Build" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/bluetoothengine/group"/>
-     </component>
-    </collection>
-    <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-     <component name="atext" long-name="Atext" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/localconnectivityservice/atext/group"/>
-     </component>
-     <component name="locod" long-name="Locod" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-     </component>
-     <component name="obexserviceman" long-name="Obex Service Man" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-     </component>
-     <component name="obexsendservices" long-name="Obex Send Services" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-     </component>
-     <component name="obexreceiveservices" long-name="OBEX Receive Services" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-     </component>
-     <component name="dun" long-name="Dun" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-     </component>
-     <component name="lcstylustap" long-name="LC Stylus Tap" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-     </component>
-     <component name="generichid" long-name="Generic HID" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-     </component>
-     <component unofficial="yes" name="localconnectivityservice_build" long-name="Local Connectivity Service Build" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/localconnectivityservice/group"/>
-     </component>
-    </collection>
-    <collection name="usbclasses" long-name="USB classes" level="framework">
-     <component name="usbobexclasscontroller" long-name="USB Obex Class Controller" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbclasses/usbobexclasscontroller/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/usbobexclasscontroller/tsrc/group"/> -->
-     </component>
-     <component name="usbbasicpersonality" long-name="USB Basic Personality" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbclasses/usbbasicpersonality/group"/>
-     </component>
-     <component name="usbmscpersonality" long-name="USB Msc Personality" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbclasses/usbmscpersonality/group"/>
-     </component>
-     <component name="ptpstack" long-name="Ptp Stack" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbclasses/ptpstack/group"/>
-     </component>
-     <component name="sicdusbplugin" long-name="Sicd USB Plugin" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbclasses/sicdusbplugin/group"/>
-     </component>
-     <component name="ptpserver" long-name="Ptp Server" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/ptpclasscontroller/group"/> -->
-     </component>
-     <component name="pictbridgeengine" long-name="Pictbridge Engine" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbclasses/pictbridgeengine/group"/>
-     </component>
-     <component name="usbosdescriptorhandler" long-name="USB Os Descriptor Handler" origin-model="foundation"/>
-    </collection>
-    <collection name="usbengines" long-name="USB Engines" level="generic">
-     <component name="usbwatcher" long-name="USB Watcher" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbengines/usbwatcher/group"/>
-     </component>
-     <component name="usblocodplugin" long-name="USB Locod Plugin" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbengines/usblocodplugin/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/usbengines/usblocodplugin/tsrc/group"/> -->
-     </component>
-     <component name="usbdevcon" long-name="USB Devcon" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbengines/usbdevcon/group"/>
-     </component>
-     <component name="usbremotepersonality" long-name="USB Remote Personality" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbengines/usbremotepersonality/group"/>
-     </component>
-    </collection>
-    <collection name="usbuis" long-name="USB UIs" level="specific">
-     <component name="usbui" long-name="USB UI" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbuis/usbui/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbui/tsrc/usbuiapitest/group"/> -->
-     </component>
-     <component name="usbuinotif" long-name="USB UI Notif" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbuis/usbuinotif/group"/>
-      <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbuinotif/tsrc/usbuinotifapitest/group"/> -->
-     </component>
-     <component name="imageprintuiprovider" long-name="ImagePrint UI Provider" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbuis/imageprintuiprovider/group"/>
-     </component>
-     <component name="usbimageprintui" long-name="ImagePrint UI" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/usbuis/imageprintui/group"/>
-     </component>
-    </collection>
-    <collection name="obex" long-name="OBEX" level="generic">
-     <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/shortlinkconn/obex/obexprotocol/group" mrp="mw/shortlinkconn/obex/obexprotocol/group/obex.mrp"/>
-     </component>
-     <component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/shortlinkconn/obex/obexextensionapi/group" mrp="mw/shortlinkconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-     </component>
-    </collection>
-    <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-     <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/shortlinkconn/bluetoothappprofiles/avrcp" mrp="mw/shortlinkconn/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-     </component>
-    </collection>
-    <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
-     <component unofficial="yes" name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/group"/>
-     </component>
-     <component unofficial="yes" name="public" origin-model="foundation">
-      <!-- <unit bldFile="mw/shortlinkconn/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/group"/>
-     </component>
-     <component unofficial="yes" name="shortlinkconn_build" long-name="Shortlink Connectivity Build" origin-model="foundation">
-      <unit bldFile="mw/shortlinkconn/group"/>
-     </component>
-    <component name="shortlinkconn_metadata" long-name="Shortlink Connectivity Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/shortlinkconn/shortlinkconn_info/shortlinkconn_metadata/shortlinkconn_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="imghandling" long-name="Image Handling" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
-    <collection name="3gplibrary" long-name="3GP Library" level="server">
-     <component name="3gpmp4lib" long-name="3GP MP4 Library" origin-model="foundation">
-      <unit bldFile="mw/imghandling/3gplibrary/3gpmp4lib/group"/>
-      <!-- <unit bldFile="mw/imghandling/3gplibrary/3gpmp4lib/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="3gplibrary_build" long-name="3GP Library Build" origin-model="foundation">
-      <unit bldFile="mw/imghandling/3gplibrary/group"/>
-     </component>
-    </collection>
-    <collection name="imagehandlinglib" long-name="Image Handling Library" level="generic">
-     <component name="ihl" long-name="IHL" origin-model="foundation">
-      <unit bldFile="mw/imghandling/imagehandlinglib/group"/>
-     </component>
-    </collection>
-    <collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="specific">
-     <component name="imageinfopopup" long-name="Image Info Popup" origin-model="foundation">
-      <unit bldFile="mw/imghandling/imagehandlingutilities/imageinfopopup/group"/>
-     </component>
-     <component name="imagepreview" long-name="Image Preview" origin-model="foundation">
-      <unit bldFile="mw/imghandling/imagehandlingutilities/imagepreview/group"/>
-     </component>
-     <component name="thumbnailmanager" long-name="Thumbnail Manager" origin-model="foundation">
-      <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-     </component>
-     <component name="tvoutengine" long-name="TV Out Engine" origin-model="foundation">
-      <unit bldFile="mw/imghandling/imagehandlingutilities/tvoutengine/group"/>
-     </component>
-    </collection>
-    <collection name="imghandling_info" long-name="Image Handling Info" level="specific">
-     <component unofficial="yes" name="imagehandling_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/tsrc/group"/> -->
-      <unit bldFile="mw/imghandling/imagehandling_plat/group"/>
-      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="imghandling_build" long-name="Image Handling Build" origin-model="foundation">
-      <unit bldFile="mw/imghandling/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="metadatasrv" long-name="Legacy Metadata Services" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
-    <collection name="contentlistingframework" long-name="Content Listing Framework" level="framework">
-     <component unofficial="yes" name="contentlistingframework_build" long-name="Content Listing Framework Build" origin-model="foundation">
-      <unit bldFile="mw/metadatasrv/contentlistingframework/group"/>
-     </component>
-    </collection>
-    <collection name="mediamanagementuis" long-name="Media Management UIs" level="server">
-     <component name="mediastylegrid" long-name="Media Style Grid" origin-model="foundation">
-      <unit bldFile="mw/metadatasrv/mediamanagementuis/mediastylegrid/group"/>
-     </component>
-    </collection>
-    <collection name="mediamanagementutilities" long-name="Media Management utilities" level="generic">
-     <component name="mediafetch" long-name="Media Fetch" origin-model="foundation">
-      <unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-     </component>
-    </collection>
-    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
-     <component unofficial="yes" name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="metadatasrv_build" long-name="Legacy Metadata Services Build" origin-model="foundation">
-      <unit bldFile="mw/metadatasrv/group"/>
-     </component>
-     <component unofficial="yes" name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="mds" long-name="Metadata Services" tech_domain="mm" level="specific" levels="mgr eng server int">
-    <collection name="clfwrapper" long-name="CLF Wrapper" level="int">
-     <component unofficial="yes" name="clfwrapper_build" long-name="CLF Wrapper Build" origin-model="foundation">
-      <unit bldFile="mw/mds/clfwrapper/group"/>
-     </component>
-    </collection>
-    <collection name="contextengine" long-name="Context Engine" level="eng">
-     <component name="contextengine_plugins" long-name="Plugins" origin-model="foundation">
-      <unit bldFile="mw/mds/contextengine/plugins/group"/>
-     </component>
-     <component unofficial="yes" name="contextengine_build" long-name="Context Engine Build" origin-model="foundation">
-      <unit bldFile="mw/mds/contextengine/group"/>
-     </component>
-    </collection>
-    <collection name="harvester" long-name="Harvester" level="eng">
-     <component name="blacklistclient" long-name="Blacklist Client" origin-model="foundation">
-      <unit bldFile="mw/mds/harvester/blacklistclient/group"/>
-     </component>
-     <component name="blacklistserver" long-name="Blacklist Server" origin-model="foundation">
-      <unit bldFile="mw/mds/harvester/blacklistserver/group"/>
-     </component>
-     <component name="harvester_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="mw/mds/harvester/common/group"/>
-     </component>
-     <component name="composerplugins" long-name="Composer Plugins" origin-model="foundation">
-      <unit bldFile="mw/mds/harvester/composerplugins/group"/>
-     </component>
-     <component name="harvesterplugins" long-name="Harvester Plugins" origin-model="foundation">
-      <!-- <unit bldFile="mw/mds/harvester/harvesterplugins/audioplaylistplugin/group"/> -->
-      <unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
-     </component>
-     <component name="monitorplugins" long-name="Monitor Plugins" origin-model="foundation">
-      <unit bldFile="mw/mds/harvester/monitorplugins/group"/>
-     </component>
-     <component name="harvester_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="mw/mds/harvester/server/group"/>
-     </component>
-     <component name="harvester_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="mw/mds/harvester/client/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_build" long-name="Harvester Build" origin-model="foundation">
-      <unit bldFile="mw/mds/harvester/group"/>
-     </component>
-    </collection>
-    <collection name="locationmanager" long-name="Location Manager" level="mgr">
-     <component name="locationtrail" long-name="Location Trail" origin-model="foundation">
-      <unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
-     </component>
-     <component name="locationmanager_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="mw/mds/locationmanager/server/group"/>
-     </component>
-     <component name="locationmanager_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="mw/mds/locationmanager/client/group"/>
-     </component>
-     <component unofficial="yes" name="locationmanager_build" long-name="Location Manager Build" origin-model="foundation">
-      <unit bldFile="mw/mds/locationmanager/group"/>
-     </component>
-    </collection>
-    <collection name="metadataengine" long-name="Metadata Engine" level="eng">
-     <component name="metadataengine_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="mw/mds/metadataengine/common/group"/>
-     </component>
-     <component name="metadataengine_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="mw/mds/metadataengine/server/group"/>
-     </component>
-     <component name="metadataengine_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="mw/mds/metadataengine/client/group"/>
-     </component>
-     <component unofficial="yes" name="metadataengine_build" long-name="Metadata Engine Build" origin-model="foundation">
-      <unit bldFile="mw/mds/metadataengine/group"/>
-     </component>
-    </collection>
-    <collection name="watchdog" long-name="Watchdog" level="server">
-     <component name="mdswatchdog" origin-model="foundation">
-      <unit bldFile="mw/mds/watchdog/group"/>
-     </component>
-    </collection>
-    <collection name="iadstoprestart" long-name="IAD Stop Restart" level="server">
-     <component unofficial="yes" name="iadstoprestart_build" long-name="IAD Stop Restart Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/mds/iadstoprestart/group"/> -->
-     </component>
-    </collection>
-    <collection name="mds_info" long-name="Metadata Services Info" level="int">
-     <component unofficial="yes" name="mds_pub" long-name="Metadata Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/mds/mds_pub/group"/>
-     </component>
-     <component unofficial="yes" name="mds_plat" long-name="Metadata Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
-      <unit bldFile="mw/mds/mds_plat/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mds_build" long-name="Metadata Services Build" origin-model="foundation">
-      <unit bldFile="mw/mds/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="mmuifw" long-name="Multimedia UI Framework" tech_domain="mm" level="specific" levels="mgr mdl util ui">
-    <collection name="alfwidgetutils" long-name="ALF Widget Utils" level="ui">
-     <component name="alfwidgetutils_build" long-name="ALF Widget Utils Component" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/alfwidgetutils/group"/>
-     </component>
-    </collection>
-    <collection name="mulwidgets" long-name="MUL Widgets" level="ui">
-     <component name="mullogging" long-name="Mul Logging" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
-     </component>
-     <component name="muldatamodel" long-name="Mul Data Model" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
-     </component>
-     <component name="mulwidgets_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
-     </component>
-     <component name="gesturehelper" long-name="Gesture Helper" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
-     </component>
-     <component name="mulcoverflowwidget" long-name="MUL Coverflow Widget" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-     </component>
-     <component name="mulsliderwidget" long-name="Mul Slider Widget" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-     </component>
-     <component name="alfviewwidget" long-name="ALF View Widget" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-     </component>
-     <component name="alfcontainerwidget" long-name="ALF Container Widget" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-     </component>
-     <component name="alfscrollbarwidget" long-name="ALF Scrollbar Widget" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-     </component>
-     <component unofficial="yes" name="mulwidgets_build" long-name="MUL Widgets Build" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mulwidgets/group"/>
-     </component>
-    </collection>
-    <collection name="osncore" long-name="OSN Core" level="util">
-     <component name="osncore_build" long-name="OSN Core" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/osncore/group"/>
-     </component>
-     
-    </collection>
-    <collection name="resourcepool" long-name="Resource Pool" level="util">
-     <component name="alfresourcepool" long-name="ALF Resource Pool" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/resourcepool/group"/>
-     </component>
-    </collection>
-    <collection name="widgetmodel" long-name="Widget Model" level="mdl">
-     <component name="alfwidgetmodel" long-name="ALF Widget Model" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetmodel/group"/> -->
-     </component>
-     <component name="alfwidgetfactory" long-name="ALF Widget Factory" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetfactory/group"/> -->
-     </component>
-     <component unofficial="yes" name="widgetmodel_build" long-name="Widget Model Build" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/widgetmodel/group"/>
-     </component>
-    </collection>
-    <collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
-     <component unofficial="yes" name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/group"/>
-     </component>
-     <component unofficial="yes" name="mmuifw_build" long-name="Multimedia UI Framework Build" origin-model="foundation">
-      <unit bldFile="mw/mmuifw/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="videoutils" long-name="Video Utils" tech_domain="mm" level="specific" levels="empty eng util">
-    <collection name="dvrengine" long-name="DVR Engine" level="eng">
-     <component name="commonrecordingengine" long-name="Common Recording Engine" origin-model="foundation">
-      <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliphandler/group"/>
-      <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliprecognizer/group"/>
-      <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtputils/group"/>
-      <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/group"/>
-     </component>
-     <component name="commonrecordingengineclient" long-name="Common Recording Engine Client" origin-model="foundation">
-      <unit bldFile="mw/videoutils/dvrengine/commonrecordingengineclient/group"/>
-     </component>
-     <component unofficial="yes" name="dvrengine_build" long-name="DVR Engine Build" origin-model="foundation">
-      <unit bldFile="mw/videoutils/dvrengine/group"/>
-     </component>
-    </collection>
-    <collection name="videoconnutility" long-name="Video Conn Utility" level="util">
-     <component name="connutilpsworker" long-name="Conn Util Ps Worker" origin-model="foundation">
-      <unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
-     </component>
-     <component unofficial="yes" name="videoconnutility_build" long-name="Video Conn Utility Build" origin-model="foundation">
-      <unit bldFile="mw/videoutils/videoconnutility/group"/>
-     </component>
-    </collection>
-    <collection name="videoscheduler" long-name="Video Scheduler" level="util">
-     <component name="schedulerclient" long-name="Scheduler Client" origin-model="foundation">
-      <unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
-     </component>
-     <component name="schedulerserver" long-name="Scheduler Server" origin-model="foundation">
-      <unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
-     </component>
-     <component unofficial="yes" name="videoscheduler_build" long-name="Video Scheduler Build" origin-model="foundation">
-      <unit bldFile="mw/videoutils/videoscheduler/group"/>
-     </component>
-    </collection>
-    <collection name="videoutils_info" long-name="Video Utils Info" level="util">
-     <component unofficial="yes" name="videoutils_plat" long-name="Video Utils Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/videoutils/videoutils_plat/group"/>
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxconnutiltestexe/group"/> -->
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestcommon/group"/> -->
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestutilmodule/group"/> -->
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="videoutils_build" long-name="Video Utils Build" origin-model="foundation">
-      <unit bldFile="mw/videoutils/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="mmmw" long-name="Multimedia Middleware" tech_domain="mm" level="generic" levels="plugin framework server generic specific">
-    <collection name="radioutility" long-name="Radio Utility" level="generic">
-     <component name="radioserver" long-name="Radio Server" origin-model="foundation">
-      <unit bldFile="mw/mmmw/radioutility/radioserver/group"/>
-      <!-- <unit bldFile="mw/mmmw/radioutility/radioserver/server/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/radioutility/radioserver/session/group"/> -->
-     </component>
-     <component name="radio_utility" long-name="Radio Utility" origin-model="foundation">
-      <unit bldFile="mw/mmmw/radioutility/radio_utility/group"/>
-     </component>
-     <component name="fmpresetutility" long-name="FM Preset Utility" origin-model="foundation">
-      <unit bldFile="mw/mmmw/radioutility/fmpresetutility/group"/>
-     </component>
-     <component unofficial="yes" name="radioutility_build" long-name="Radio Utility Build" origin-model="foundation">
-      <unit bldFile="mw/mmmw/radioutility/group"/>
-     </component>
-    </collection>
-    <collection name="mtp" long-name="MTP" level="framework">
-     <component name="mtpserver" long-name="Mtp Server" origin-model="foundation"/>
-     <component name="mtpusbclass" long-name="MTP USB Class" origin-model="foundation"/>
-     <component name="install" long-name="Install" origin-model="foundation"/>
-    </collection>
-    <collection name="audioeffectsui" long-name="Audio Effects UI" level="specific">
-     <component name="equalizer" long-name="Equalizer" origin-model="foundation">
-      <unit bldFile="mw/mmmw/audioeffectsui/equalizer/group"/>
-     </component>
-     <component unofficial="yes" name="audioeffectsui_build" long-name="Audio Effects UI Build" origin-model="foundation">
-      <unit bldFile="mw/mmmw/audioeffectsui/group"/>
-     </component>
-    </collection>
-    <collection name="audioenhancements" long-name="Audio Enhancements" level="generic">
-     <component name="enhancedaudioplayerutility" long-name="Enhanced Media Client" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/audioplayer/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/audiostreaming/group"/> -->
-      <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/group"/>
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosource/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosourcefactory/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audioutility/group"/> -->
-     </component>
-     <component name="progressivedownload" long-name="Progressive Download" origin-model="foundation">
-      <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/group"/>
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/progressivedownloadsource/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/progressivedownloadutility/group"/> -->
-     </component>
-     <component name="enhancedmediaclient" long-name="Enhanced Media Client" origin-model="foundation">
-      <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/group"/>
-     </component>
-     <component name="profilesettingsmonitor" long-name="Profile Settings Monitor" origin-model="foundation">
-      <unit bldFile="mw/mmmw/audioenhancements/profilesettingsmonitor/group"/>
-     </component>
-     <component name="voipaudioservices" long-name="VoIP Audio Services" origin-model="foundation">
-      <unit bldFile="mw/mmmw/audioenhancements/voipaudioservices/group"/>
-     </component>
-     <component name="configurationcomponentsfactory" long-name="Configuration Components Factory" origin-model="foundation">
-      <unit bldFile="mw/mmmw/audioenhancements/configurationcomponentsfactory/group"/>
-     </component>
-     <component name="audiooutputcontrolutility" long-name="Audio Output Control Utility" origin-model="foundation">
-      <unit bldFile="mw/mmmw/audioenhancements/audiooutputcontrolutility/group"/>
-     </component>
-     <component name="callaudiocontrol" long-name="Call Audio Control" origin-model="foundation">
-      <unit bldFile="mw/mmmw/audioenhancements/callaudiocontrol/group"/>
-     </component>
-     <component unofficial="yes" name="audioenhancements_build" long-name="Audio Enhancements Build" origin-model="foundation">
-      <unit bldFile="mw/mmmw/audioenhancements/group"/>
-     </component>
-    </collection>
-    <collection name="metadatautility" long-name="Metadata Utility" level="generic">
-     <component name="3gpextparserlib" origin-model="foundation"/>
-     <component name="3gpextparserlib_stub" origin-model="foundation">
-      <unit bldFile="mw/mmmw/metadatautility/3gpextparserlib_stub/group"/>
-     </component>
-     <component name="metadatautility_build" origin-model="foundation">
-      <unit bldFile="mw/mmmw/metadatautility/group"/>
-     </component>
-    </collection>
-    <collection name="advancedaudiocontroller" long-name="Advanced Audio Controller" level="plugin">
-     <component name="audiocontrollerpluginsvariant" long-name="Audio Controller Plugins Variant" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpdatasourceadapter/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontrollerutility/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/datasourceadapter/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudioinput/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudiooutput/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/fileaudiooutput/group"/> -->
-      <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/group"/>
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/hxaudiorecognizer/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/metadatawrite/group"/> -->
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/group"/> -->
-     </component>
-     <component name="wavplaycontrollerplugin" long-name="WAV Play Controller Plugin" origin-model="foundation">
-      <unit bldFile="mw/mmmw/advancedaudiocontroller/wavplaycontrollerplugin/group"/>
-     </component>
-     <component unofficial="yes" name="advancedaudiocontroller_test" long-name="Advanced Audio Controller Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/> -->
-     </component>
-     <component unofficial="yes" name="advancedaudiocontroller_build" long-name="Advanced Audio Controller Build" origin-model="foundation">
-      <unit bldFile="mw/mmmw/advancedaudiocontroller/group"/>
-     </component>
-    </collection>
-    <collection name="thumbnailengine" long-name="Thumbnail Engine" level="server">
-     <component name="tneengine" long-name="TNE Engine" origin-model="foundation">
-      <unit bldFile="mw/mmmw/thumbnailengine/group"/>
-     </component>
-    </collection>
-    <collection name="mmfw" long-name="Multimedia Framework" level="framework">
-     <component name="gstreamer" long-name="GStreamer" origin-model="foundation"/>
-     <component name="helix_stub" long-name="Helix Stub" origin-model="foundation">
-      <unit bldFile="mw/mmmw/mmfw/helix_stub/group"/>
-     </component>
-     <component unofficial="yes" name="mmfw_build" long-name="Multimedia Framework Build" origin-model="foundation">
-      <unit bldFile="mw/mmmw/mmfw/group"/>
-     </component>
-    </collection>
-    <collection name="mmmiddlewarefws" long-name="Multimedia Middleware Frameworks" level="server">
-     <component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group/multimedia_mmf.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmmiddlewareplugins" long-name="Multimedia Middleware Plugins" level="framework">
-     <component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group_plugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group_plugin/multimedia_mmf_plugin.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
-     <component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/mmmw/mmfwtest/mmfunittest/group/multimedia_unittest_mmf_source.mrp"/>
-     </component>
-     <component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/mmmw/mmfwtest/mmfintegrationtest/group/multimedia_inttest_mmf_source.mrp"/>
-     </component>
-     <component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group" mrp="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group/multimedia_mmf_char.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
-     <component name="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group/multimedia_mvs_app.mrp"/>
-     </component>
-     <component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group/multimedia_mvs_agents.mrp"/>
-     </component>
-     <component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/mmmw/mmvalidationsuite/mvsintegrationtest/group/multimedia_inttest_mvs_source.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-     <component unofficial="yes" name="mmmw_build" long-name="Multimedia Middleware Build" origin-model="foundation">
-      <unit bldFile="mw/mmmw/group"/>
-     </component>
-     <component unofficial="yes" name="mmmw_test" long-name="Multimedia Middleware Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmmw/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/tsrc/group"/>
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/tsrc/group"/>
-      <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/tsrc/group"/>
-      <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/tsrc/group"/>
-      <unit bldFile="mw/mmmw/mmmw_plat/group"/>
-      <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/tsrc/group"/>
-      <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/tsrc/group"/>
-     </component>
-    <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="helix" long-name="Helix" tech_domain="mm" level="generic" levels="plugin framework server generic specific">
-    <collection name="helix_ren" long-name="Helix" level="framework">
-     <component name="helixrfsplugin" long-name="Helix RFS Plugin" origin-model="foundation"/>
-     <component name="helix_binary" long-name="Helix Binary" origin-model="foundation"/>
-     <component name="src" long-name="Src" origin-model="foundation"/>
-    </collection>
-   </block>
    <block name="camerasrv" long-name="Camera Services" tech_domain="mm" level="specific" levels="plugin fw api">
     <collection name="camappengine" long-name="Camera App Engine" level="fw">
      <component name="stillconverter" long-name="Still Converter" origin-model="foundation">
@@ -6111,170 +3441,6 @@
      </component>
     </collection>
    </block>
-   <block name="mmappfw" long-name="Multimedia App Framework" tech_domain="mm" level="specific" levels="empty fw utils">
-    <collection name="mmappcomponents" long-name="MM App Components" level="utils">
-     <component name="collectionhelper" long-name="Collection Helper" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-     </component>
-     <component name="playlistengine" long-name="Playlist Engine" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
-     </component>
-     <component name="mmappfwharvester" long-name="Harvester" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
-     </component>
-     <component name="mmappcommonui" long-name="MM App Common UI" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-     </component>
-     <component name="mediaplayersettingsengine" long-name="Media Player Settings Engine" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-     </component>
-     <component name="audiofetcher" long-name="UUDIO Fetcher" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mmappcomponents/audiofetcher/group"/>
-     </component>
-     <component name="asxparser" long-name="ASX Parser" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mmappcomponents/asxparser/group"/>
-      <!-- <unit bldFile="mw/mmappfw/mmappcomponents/asxparser/test"/> -->
-     </component>
-    </collection>
-    <collection name="mpx" long-name="MPX" level="fw">
-     <component name="commonframework" long-name="Common Framework" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
-     </component>
-     <component name="playbackframework" long-name="Playback Framework" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
-     </component>
-     <component name="mpxcollectionfw" long-name="Collection Framework" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
-     </component>
-     <component name="mpxviewfw" long-name="View Framework" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_build" long-name="MPX Build" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mpx/group"/>
-     </component>
-    </collection>
-    <collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="utils">
-     <component unofficial="yes" name="mmappfw_build" long-name="Multimedia App Framework Build" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/group"/>
-     </component>
-     <component unofficial="yes" name="mmappfw_test" long-name="Multimedia App Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/mmappfw/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/tsrc/group"/>
-      <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/tsrc/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="inputmethods" long-name="Input Methods" tech_domain="ui" level="generic" levels="plugin engine framework">
-    <collection name="textinput" long-name="Text Input" level="framework">
-     <component name="ptienginev2" long-name="PTI Engine V2" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/>
-     </component>
-     <component name="akninputlanguage" long-name="Akn Input Language" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
-     </component>
-     <component name="peninputarc" long-name="Pen Input Arc" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/src/peninputserverapp"/> -->
-      <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/utils/group"/> -->
-     </component>
-     <component name="peninputcommonctrls" long-name="Pen Input Common Ctrls" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
-     </component>
-     <component name="peninputhwrboxcn" long-name="Pen Input Hardwarer Boxcn" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-     </component>
-     <component name="peninputvkbcn" long-name="Pen Input Vkbcn" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
-     </component>
-     <component name="peninputcommonlayout" long-name="Pen Input Common Layout" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
-     </component>
-     <component name="peninputgenerichwr" long-name="Pen Input Generic Hwr" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
-     </component>
-     <component name="peninputgenericvkb" long-name="Pen Input Generic Vkb" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
-     </component>
-     <component name="peninputcommonctrlsjp" long-name="Pen Input Common Ctrls Jp" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-     </component>
-     <component name="peninputhwrboxjp" long-name="Pen Input Hardwarer Boxjp" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-     </component>
-     <component name="peninputvkbjp" long-name="Pen Input Vkbjp" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
-     </component>
-     <component name="peninputgenericitut" long-name="Pen Input Generici Tut" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
-     </component>
-     <component name="peninputhwrtrui" long-name="Pen Input Hardwarer Tr UI" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
-     </component>
-     <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
-     </component>
-     <component name="matsutake" long-name="Matsutake" origin-model="foundation"/>
-     <component unofficial="yes" name="textinput_build" long-name="Text Input Build" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/group"/>
-     </component>
-     <component unofficial="yes" name="gslangplugin" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/textinput/gslangplugin"/>
-     </component>
-    </collection>
-    <collection name="fep" long-name="FEP" level="engine">
-     <component name="aknfep" long-name="AKN FEP" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/fep/aknfep/group"/>
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugincn/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugingeneric/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginitut/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginjp/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/avkonimpl/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="frontendprocessor">
-       <unit bldFile="mw/inputmethods/fep/frontendprocessor/test/group"/>
-     </component>-->
-    <component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-     </component>
-    </collection>
-    <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
-     <component unofficial="yes" name="inputmethods_plat" long-name="Input Methods Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_plat/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/group"/>
-     </component>
-     <component unofficial="yes" name="inputmethods_pub" long-name="Input Methods Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/inputmethods/inputmethods_pub/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
-     </component>
-    <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
    <block name="classicui" long-name="Classic UI" tech_domain="ui" level="generic" levels="base support server generic specific">
     <collection name="psln" long-name="Personalization" level="specific">
      <component name="pslnengine" long-name="Personalization Engine" origin-model="foundation">
@@ -6527,6 +3693,2925 @@
      </component>
     </collection>
    </block>
+   <block name="dlnasrv" long-name="DLNA Services" tech_domain="de" level="specific" levels="framework server plugin">
+    <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
+     <component name="avcontrolframework" long-name="A/V Control Famework" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
+     </component>
+     <component name="avcpengine" long-name="AVCP Engine" origin-model="foundation"/>
+     <component name="avcpengineclient" long-name="Avcp Engine Client" origin-model="foundation"/>
+     <component name="upnpaccessplugin" long-name="UPnP Access Plugin" origin-model="foundation"/>
+     <component unofficial="yes" name="upnpavcontrolpoint_build" long-name="UPnP A/V Control Point Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/group"/>
+     </component>
+    </collection>
+    <collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
+     <component name="avobjects" long-name="A/V Objects" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpmediaserver/avobjects/group"/>
+     </component>
+     <component name="mediaserverclient" long-name="Media Server Client" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
+     </component>
+     <component name="connectionmanagerservice" long-name="Connection Manager Service" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
+     </component>
+     <component name="contentdirectoryservice" long-name="Content Directory Service" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
+     </component>
+     <component name="mediaserverengine" long-name="Media Server Engine" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
+     </component>
+     <component unofficial="yes" name="upnpmediaserver_build" long-name="UPnP Media Server Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpmediaserver/group"/>
+     </component>
+    </collection>
+    <collection name="upnpstack" long-name="UPnP Stack" level="framework">
+     <component name="upnputils" long-name="UPnP Utils" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpstack/upnputils/group"/>
+     </component>
+     <component name="upnpconnectionmanagersession" long-name="UPnP Connection Manager Session" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpstack/upnpconnectionmanagersession/group"/>
+     </component>
+     <component name="upnpconnmanager" long-name="UPnP Connection Manager" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpstack/upnpconnmanager/group"/>
+     </component>
+     <component name="dlnawebserver" long-name="DLNA Web Server" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpstack/dlnawebserver/group"/>
+     </component>
+     <component name="serviceframework" long-name="Service Framework" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpstack/serviceframework/group"/>
+     </component>
+     <component name="ssdpserver" long-name="SSDP Server" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpstack/ssdpserver/group"/>
+     </component>
+     <component name="messagehandler" long-name="Message Handler" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpstack/messagehandler/group"/>
+     </component>
+     <component name="controlpointbase" long-name="Control Point Base" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpstack/controlpointbase/group"/>
+     </component>
+     <component name="upnphttptransfer" long-name="UPnP HTTP Transfer" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpstack/upnphttptransfer/group"/>
+     </component>
+     <component unofficial="yes" name="upnpstack_build" long-name="UPnP Stack Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpstack/group"/>
+     </component>
+    </collection>
+    <collection name="upnpsharing" long-name="UPnP Sharing" level="server">
+     <component name="upnpdlnaprofiler" long-name="UPnP DLNA Profiler" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
+     </component>
+     <component name="upnpsecurity" long-name="UPnP Security" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
+     </component>
+     <component name="upnpcontentserver" long-name="UPnP Content Server" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
+     </component>
+     <component name="applicationengine" long-name="Application Engine" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsharing/applicationengine/group"/>
+     </component>
+     <component unofficial="yes" name="upnpsharing_build" long-name="UPnP Sharing Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsharing/group"/>
+     </component>
+    </collection>
+    <collection name="upnpsettings" long-name="UPnP Settings" level="framework">
+     <component name="upnpsettingsengine" long-name="UPnP Settings Engine" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
+     </component>
+     <component name="multiselectionui" long-name="Multi-Selection UI" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsettings/multiselectionui/group"/>
+     </component>
+     <component name="appwizard" long-name="App Wizard" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsettings/appwizard/group"/>
+     </component>
+     <component name="upnpsharingui" long-name="UPnP Sharing UI" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
+     </component>
+     <component name="upnpgsplugin" long-name="UPnP GS Plugin" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
+     </component>
+     <component unofficial="yes" name="upnpsettings_build" long-name="UPnP Settings Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpsettings/group"/>
+     </component>
+    </collection>
+    <collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
+     <component name="upnpplaybackplugins" long-name="UPnP Playback Plugins" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
+     </component>
+     <component unofficial="yes" name="upnpmpxplugins_build" long-name="UPnP MPX Plugins Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpmpxplugins/group"/>
+     </component>
+    </collection>
+    <collection name="upnpharvester" long-name="UPnP Harvester" level="server">
+     <component name="upnpharvester_common" long-name="Common" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
+      <unit bldFile="mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
+      <unit bldFile="mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
+      <unit bldFile="mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
+     </component>
+     <component name="cdssync" long-name="CDS Sync" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpharvester/cdssync/common"/>
+     </component>
+     <component name="mdhserver" long-name="MDH Server" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpharvester/mdhserver/group"/>
+     </component>
+     <component unofficial="yes" name="upnpharvester_build" long-name="UPnP Harvester Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpharvester/group"/>
+     </component>
+    </collection>
+    <collection name="upnpframework" long-name="UPnP Framework" level="framework">
+     <component name="upnputilities" long-name="UPnP Utilities" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpframework/upnputilities/group"/>
+     </component>
+     <component name="upnpextensionpluginif" long-name="UPnP Extension Plugin IF" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
+     </component>
+     <component name="upnpfiletransferengine" long-name="UPnP File Transfer Engine" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
+     </component>
+     <component name="upnpmusicadapter" long-name="UPnP Musicadapter" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
+     </component>
+     <component name="upnpcommonui" long-name="UPnP Common UI" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpframework/upnpcommonui/group"/>
+     </component>
+     <component name="upnpcommand" long-name="UPnP Command" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpframework/upnpcommand/group"/>
+     </component>
+     <component name="upnpaiwengine" long-name="UPnP AIW Engine" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
+     </component>
+     <component name="upnpaiwprovider" long-name="UPnP AIW Provider" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
+     </component>
+     <component unofficial="yes" name="upnpframework_build" long-name="UPnP Framework Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpframework/group"/>
+     </component>
+    </collection>
+    <collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="server">
+     <component name="upnpxmlparser" long-name="UPnP XML Parser" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
+     </component>
+     <component name="upnpavcontrollerserver" long-name="UPnP A/V Controller Server" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
+     </component>
+     <component name="upnpavcontrollerclient" long-name="UPnP A/V Ccontroller Client" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
+     </component>
+     <component name="upnpavcontrollerhelper" long-name="UPnP A/V Controller Helper" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
+     </component>
+     <component unofficial="yes" name="upnpavcontroller_build" long-name="UPnP A/V Controller Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/upnpavcontroller/group"/>
+     </component>
+    </collection>
+    <collection name="homesync" long-name="Home Sync" level="plugin">
+     <component name="contentmanager" long-name="Content Manager" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmfillmanager/group"/>
+      <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmmemorymanager/group"/>
+      <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmscheduler/group"/>
+      <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmserver/group"/>
+      <unit bldFile="mw/dlnasrv/homesync/contentmanager/cmserver/cmstoremanager/group"/>
+      <unit bldFile="mw/dlnasrv/homesync/contentmanager/homesyncgsplugin/group"/>
+      <unit bldFile="mw/dlnasrv/homesync/contentmanager/homesyncwizard/group"/>
+      <unit bldFile="mw/dlnasrv/homesync/contentmanager/mediaservant/applicationengine/group"/>
+      <unit bldFile="mw/dlnasrv/homesync/contentmanager/mediaservant/group"/>
+     </component>
+     <component unofficial="yes" name="homesync_build" long-name="Home Sync Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/homesync/group"/>
+     </component>
+    </collection>
+    <collection name="homemedia" long-name="Home Media" level="framework">
+     <component name="homemedia_build" long-name="Home Media" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/homemedia/group"/>
+     </component>
+     
+    </collection>
+    <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
+     <component unofficial="yes" name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/group"/>
+     </component>
+     <component unofficial="yes" name="dlnasrv_build" long-name="DLNA Services Build" origin-model="foundation">
+      <unit bldFile="mw/dlnasrv/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="drm" long-name="DRM" tech_domain="se" level="generic" levels="plugin framework server generic specific">
+    <collection name="commondrm" long-name="Common DRM" level="generic">
+     <component name="drmencryptor" long-name="DRM Encryptor" origin-model="foundation"/>
+     <component name="drmsettingsplugin" long-name="DRM Settings Plugin" origin-model="foundation"/>
+     <component name="drmrightsmanagerui" long-name="DRM Rights Manager UI" origin-model="foundation">
+      <unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+     </component>
+     <component name="drmutility" long-name="DRM Utility" origin-model="foundation">
+      <unit bldFile="mw/drm/commondrm/drmutility/group"/>
+     </component>
+     <component name="drmserviceapiwrapper" long-name="DRM Service API Wrapper" origin-model="foundation">
+      <unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
+     </component>
+     <component name="drmrightsstoringlocation" long-name="DRM Rights Storing Location" origin-model="foundation">
+      <unit bldFile="mw/drm/commondrm/drmrightsstoringlocation/group"/>
+     </component>
+     <component unofficial="yes" name="commondrm_build" long-name="Common DRM Build" origin-model="foundation">
+      <unit bldFile="mw/drm/commondrm/group"/>
+     </component>
+    </collection>
+    <collection name="omadrm" long-name="OMA DRM" level="server">
+     <component name="drmroapwbxmlparser" long-name="DRM ROAP WBXML Parser" origin-model="foundation">
+      <!-- <unit bldFile="mw/drm/omadrm/drmroapwbxmlparser/group"/> -->
+     </component>
+     <component name="drmplugins" long-name="DRM Plugins" origin-model="foundation">
+      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmfilter/group"/> -->
+      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmrecognizer/group"/> -->
+      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmrohandler/group"/> -->
+      <!-- <unit bldFile="mw/drm/omadrm/drmplugins/drmromtm/group"/> -->
+     </component>
+     <component name="drmengine" long-name="DRM Engine" origin-model="foundation"/>
+     <component name="drmhelper" long-name="DRM Helper" origin-model="foundation">
+      <!-- <unit bldFile="mw/drm/omadrm/drmhelper/drmhelperserver/group"/> -->
+      <!-- <unit bldFile="mw/drm/omadrm/drmhelper/group"/> -->
+     </component>
+     <component name="drmlicensemanager" long-name="Drm License Manager" origin-model="foundation">
+      <!-- <unit bldFile="mw/drm/omadrm/drmlicensemanager/group"/> -->
+     </component>
+     <component unofficial="yes" name="omadrm_build" long-name="OMA DRM Build" origin-model="foundation">
+      <unit bldFile="mw/drm/omadrm/group"/>
+     </component>
+    </collection>
+    <collection name="wmdrm" long-name="WM DRM" level="framework">
+     <component name="wmdrmengine" long-name="WM DRM Engine" origin-model="foundation">
+      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmagent/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/client/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/server/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/client/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/clientwrapper/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/wmdrmengine/wmdrmserver/server/group"/> -->
+     </component>
+     <component name="camese" long-name="Camese" origin-model="foundation">
+      <!-- <unit bldFile="mw/drm/wmdrm/camese/cameseutility/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/camese/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/camese/httpfiltercamese/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdla/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlaapp/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdladefaulthttpplugin/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdladefaultuiplugin/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlautils/group"/> -->
+      <!-- <unit bldFile="mw/drm/wmdrm/camese/wmdrmdlawrapper/group"/> -->
+     </component>
+     <component name="wmdrmplugins" long-name="WM DRM Plugins" origin-model="foundation"/>
+     <component unofficial="yes" name="wmdrm_build" long-name="WM DRM Build" origin-model="foundation">
+      <unit bldFile="mw/drm/wmdrm/group"/>
+     </component>
+    </collection>
+    <collection name="drm_info" long-name="DRM Info" level="specific">
+     <component unofficial="yes" name="drm_pub" long-name="DRM Public Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/tsrc/group"/> -->
+      <unit bldFile="mw/drm/drm_pub/group"/>
+      <!-- <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
+     </component>
+     <component unofficial="yes" name="drm_plat" long-name="DRM Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
+      <unit bldFile="mw/drm/drm_plat/group"/>
+      <!-- <unit bldFile="mw/drm/drm_plat/roap_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="drm_build" long-name="DRM Build" origin-model="foundation">
+      <unit bldFile="mw/drm/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="hapticsservices" long-name="Haptics Services" tech_domain="ui" level="generic" levels="fw api">
+    <collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
+     <component name="tactilearearegistry" long-name="Tactile Area Registry" origin-model="foundation">
+      <unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
+     </component>
+     <component name="tactilefeedbackclient" long-name="Tactile Feedback Client" origin-model="foundation">
+      <unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
+     </component>
+     <component name="tactileactionplugin" long-name="TactilE Action Plugin" origin-model="foundation"/>
+     <component name="tactileclickplugin" long-name="Tactile Click Plugin" origin-model="foundation"/>
+     <component name="tactilefeedbackresolver" long-name="Tactile Feedback Resolver" origin-model="foundation"/>
+     <component unofficial="yes" name="tactilefeedback_build" long-name="Tactile Feedback Build" origin-model="foundation">
+      <unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
+     </component>
+    </collection>
+    <collection name="hapticsservices_info" long-name="Haptics Services Info" level="api">
+     <component unofficial="yes" name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/hapticsservices/hapticsservices_pub/group"/>
+     </component>
+     <component unofficial="yes" name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/hapticsservices/hapticsservices_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="helix" long-name="Helix" tech_domain="mm" level="generic" levels="plugin framework server generic specific">
+    <collection name="helix_ren" long-name="Helix" level="framework">
+     <component name="helixrfsplugin" long-name="Helix RFS Plugin" origin-model="foundation"/>
+     <component name="helix_binary" long-name="Helix Binary" origin-model="foundation"/>
+     <component name="src" long-name="Src" origin-model="foundation"/>
+    </collection>
+   </block>
+   <block name="homescreensrv" long-name="Home Screen Services" tech_domain="ui" level="specific" levels="plugin framework server generic specific">
+    <collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
+     <component name="contentpublishingutils" long-name="Content Publishing Utils" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/>
+      <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
+     </component>
+     <component name="contentpublishingserver" long-name="Content Publishing Server" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
+     </component>
+     <component name="contentharvester" long-name="Content Harvester" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
+     </component>
+     <component unofficial="yes" name="contentpublishingsrv_build" long-name="Content Publishing Service Build" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
+     </component>
+    </collection>
+    <collection name="backsteppingsrv" long-name="Backstepping Service" level="server">
+     <component name="bsengine" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
+     </component>
+    </collection>
+    <collection name="xcfw" long-name="XCFW" level="framework">
+     <component name="xcfw_build" long-name="XCFW" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/xcfw/group"/>
+     </component>
+    </collection>
+    <collection name="homescreenpluginsrv" long-name="Homescreen Plugin Service" level="plugin">
+     <component name="hspsdefinitionengine" long-name="Homescreen Plugin Server Definition Engine" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdefinitionengine/group"/>
+     </component>
+     <component name="hspsdom" long-name="Homescreen Plugin Server DOM" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdom/group"/>
+     </component>
+     <component name="hspspluginregistry" long-name="Homescreen Plugin Registry" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspspluginregistry/group"/>
+     </component>
+     <component name="hspsmanager" long-name="Homescreen Plugin Server Manager" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsmanager/group"/>
+     </component>
+     <component name="hspsodt" long-name="Homescreen Plugin Server ODT" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsodt/group"/>
+     </component>
+     <component name="hspsresource" long-name="Homescreen Plugin Server Resource" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsresource/group"/>
+     </component>
+     <component name="hspsresult" long-name="Homescreen Plugin Server Result" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsresult/group"/>
+     </component>
+     <component name="hspstools" long-name="Homescreen Plugin Server Tools" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspstools/group"/>
+     </component>
+     <component unofficial="yes" name="homescreenpluginsrv_build" long-name="Homescreen Plugin Service Build" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
+     </component>
+    </collection>
+    <collection name="idlefw" long-name="Idle Framework" level="framework">
+     <component name="idlefw_plugins" long-name="Plugins" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/idlefw/plugins/group"/>
+      <!-- <unit bldFile="mw/homescreensrv/idlefw/plugins/pslnactiveidleplugin/group"/> -->
+     </component>
+     <component unofficial="yes" name="idlefw_build" long-name="Idle Framework Build" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/idlefw/group"/>
+     </component>
+    </collection>
+    <collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
+     <component name="menusatinterface" long-name="Menu SAT Interface" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
+     </component>
+     <component unofficial="yes" name="menucontentsrv_build" long-name="Menu Content Service Build" origin-model="foundation">
+      <unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
+     </component>
+    </collection>
+    <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
+     <component unofficial="yes" name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/> -->
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/group"/>
+      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
+     </component>
+    </collection>
+   </block>
+   <block name="imghandling" long-name="Image Handling" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
+    <collection name="3gplibrary" long-name="3GP Library" level="server">
+     <component name="3gpmp4lib" long-name="3GP MP4 Library" origin-model="foundation">
+      <unit bldFile="mw/imghandling/3gplibrary/3gpmp4lib/group"/>
+      <!-- <unit bldFile="mw/imghandling/3gplibrary/3gpmp4lib/tsrc/public/basic/group"/> -->
+     </component>
+     <component unofficial="yes" name="3gplibrary_build" long-name="3GP Library Build" origin-model="foundation">
+      <unit bldFile="mw/imghandling/3gplibrary/group"/>
+     </component>
+    </collection>
+    <collection name="imagehandlinglib" long-name="Image Handling Library" level="generic">
+     <component name="ihl" long-name="IHL" origin-model="foundation">
+      <unit bldFile="mw/imghandling/imagehandlinglib/group"/>
+     </component>
+    </collection>
+    <collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="specific">
+     <component name="imageinfopopup" long-name="Image Info Popup" origin-model="foundation">
+      <unit bldFile="mw/imghandling/imagehandlingutilities/imageinfopopup/group"/>
+     </component>
+     <component name="imagepreview" long-name="Image Preview" origin-model="foundation">
+      <unit bldFile="mw/imghandling/imagehandlingutilities/imagepreview/group"/>
+     </component>
+     <component name="thumbnailmanager" long-name="Thumbnail Manager" origin-model="foundation">
+      <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
+     </component>
+     <component name="tvoutengine" long-name="TV Out Engine" origin-model="foundation">
+      <unit bldFile="mw/imghandling/imagehandlingutilities/tvoutengine/group"/>
+     </component>
+    </collection>
+    <collection name="imghandling_info" long-name="Image Handling Info" level="specific">
+     <component unofficial="yes" name="imagehandling_plat" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/tsrc/group"/> -->
+      <unit bldFile="mw/imghandling/imagehandling_plat/group"/>
+      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="imghandling_build" long-name="Image Handling Build" origin-model="foundation">
+      <unit bldFile="mw/imghandling/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="imsrv" long-name="Instant Messaging and Presence Services" tech_domain="pr" level="specific" levels="plugin framework server generic specific">
+    <collection name="imservices" long-name="IM Services" level="generic">
+     <component name="imfeatureplugin" long-name="IM Feature Plugin" origin-model="foundation">
+      <unit bldFile="mw/imsrv/imservices/imfeatureplugin/group"/>
+      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimdatamodel/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimfrontend/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimoperations/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imservices/imfeatureplugin/srcimprocessor/group"/> -->
+     </component>
+     <component name="searchfeatureplugin" long-name="Search Feature Plugin" origin-model="foundation">
+      <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/group"/>
+      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchdatamodel/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchfrontend/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchoperations/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchprocessor/group"/> -->
+     </component>
+     <component name="xmppsettingsapi" long-name="XMPP Setting Sapi" origin-model="foundation">
+      <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
+      <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/tsrc/group"/> -->
+     </component>
+     <component name="xmppsettingsfetcher" long-name="XMPP Settingsfetcher" origin-model="foundation">
+      <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
+      <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
+     </component>
+     <component name="ossprotocoladaptation" long-name="OSS Protocol Adaptation" origin-model="foundation">
+      <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/> -->
+      <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
+      <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
+     </component>
+     <component name="instantmessagingcache" long-name="Instant Messaging Cache" origin-model="foundation">
+      <unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
+      <!-- <unit bldFile="mw/imsrv/imservices/instantmessagingcache/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="imservices_build" long-name="IM Services Build" origin-model="foundation">
+      <unit bldFile="mw/imsrv/imservices/group"/>
+     </component>
+    </collection>
+    <collection name="ximpfw" long-name="XIMP Framework" level="framework">
+     <component name="ximpfw_core" long-name="Core" origin-model="foundation">
+      <!-- <unit bldFile="mw/imsrv/ximpfw/core/group"/> -->
+     </component>
+     <component name="presence" long-name="Presence" origin-model="foundation">
+      <!-- <unit bldFile="mw/imsrv/ximpfw/presence/group"/> -->
+     </component>
+     <component unofficial="yes" name="ximpfw_test" long-name="XIMP Framework Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatching"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcutils"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_rootservices"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceall"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegrouplistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencecache"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencepublishing"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_sessionmng"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceauthorization"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_eunittemplate"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_utils"/> -->
+     </component>
+     <component unofficial="yes" name="ximpfw_build" long-name="XIMP Framework Build" origin-model="foundation">
+      <unit bldFile="mw/imsrv/ximpfw/group"/>
+     </component>
+    </collection>
+    <collection name="brandingserver" long-name="Branding Server" level="specific">
+     <component name="tools" long-name="Tools" origin-model="foundation">
+      <!-- <unit bldFile="mw/imsrv/brandingserver/tools/bsimport/group"/> -->
+     </component>
+     <component unofficial="yes" name="brandingserver_build" long-name="Branding Server Build" origin-model="foundation">
+      <unit bldFile="mw/imsrv/brandingserver/group"/>
+     </component>
+    </collection>
+    <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
+     <component unofficial="yes" name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/imsrv/imsrv_plat/group"/>
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="imsrv_build" long-name="Instant Messaging and Presence Services Build" origin-model="foundation">
+      <unit bldFile="mw/imsrv/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="inputmethods" long-name="Input Methods" tech_domain="ui" level="generic" levels="plugin engine framework">
+    <collection name="textinput" long-name="Text Input" level="framework">
+     <component name="ptienginev2" long-name="PTI Engine V2" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/>
+     </component>
+     <component name="akninputlanguage" long-name="Akn Input Language" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
+     </component>
+     <component name="peninputarc" long-name="Pen Input Arc" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputarc/group"/>
+      <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/src/peninputserverapp"/> -->
+      <!-- <unit bldFile="mw/inputmethods/textinput/peninputarc/utils/group"/> -->
+     </component>
+     <component name="peninputcommonctrls" long-name="Pen Input Common Ctrls" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputcommonctrls/group"/>
+     </component>
+     <component name="peninputhwrboxcn" long-name="Pen Input Hardwarer Boxcn" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputhwrboxcn/group"/>
+     </component>
+     <component name="peninputvkbcn" long-name="Pen Input Vkbcn" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputvkbcn/group"/>
+     </component>
+     <component name="peninputcommonlayout" long-name="Pen Input Common Layout" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputcommonlayout/group"/>
+     </component>
+     <component name="peninputgenerichwr" long-name="Pen Input Generic Hwr" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputgenerichwr/group"/>
+     </component>
+     <component name="peninputgenericvkb" long-name="Pen Input Generic Vkb" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputgenericvkb/group"/>
+     </component>
+     <component name="peninputcommonctrlsjp" long-name="Pen Input Common Ctrls Jp" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
+     </component>
+     <component name="peninputhwrboxjp" long-name="Pen Input Hardwarer Boxjp" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputhwrboxjp/group"/>
+     </component>
+     <component name="peninputvkbjp" long-name="Pen Input Vkbjp" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputvkbjp/group"/>
+     </component>
+     <component name="peninputgenericitut" long-name="Pen Input Generici Tut" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputgenericitut/group"/>
+     </component>
+     <component name="peninputhwrtrui" long-name="Pen Input Hardwarer Tr UI" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputhwrtrui/group"/>
+     </component>
+     <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
+     </component>
+     <component name="matsutake" long-name="Matsutake" origin-model="foundation"/>
+     <component unofficial="yes" name="textinput_build" long-name="Text Input Build" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/group"/>
+     </component>
+     <component unofficial="yes" name="gslangplugin" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/textinput/gslangplugin"/>
+     </component>
+    </collection>
+    <collection name="fep" long-name="FEP" level="engine">
+     <component name="aknfep" long-name="AKN FEP" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/fep/aknfep/group"/>
+      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugincn/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugingeneric/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginitut/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginjp/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/avkonimpl/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/group"/> -->
+     </component>
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="frontendprocessor">
+       <unit bldFile="mw/inputmethods/fep/frontendprocessor/test/group"/>
+     </component>-->
+    <component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
+     </component>
+    </collection>
+    <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
+     <component unofficial="yes" name="inputmethods_plat" long-name="Input Methods Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
+      <unit bldFile="mw/inputmethods/inputmethods_plat/group"/>
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/group"/>
+     </component>
+     <component unofficial="yes" name="inputmethods_pub" long-name="Input Methods Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/inputmethods/inputmethods_pub/group"/>
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
+     </component>
+    <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="ipappprotocols" long-name="IP App Protocols" tech_domain="dc" level="generic" levels="plugin framework conn server">
+    <collection name="rtp" long-name="RTP" level="server">
+     <component name="srtpstack" long-name="SRTP Stack" origin-model="foundation">
+      <unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
+      <!-- <unit bldFile="mw/ipappprotocols/rtp/srtpstack/tsrc/ut_srtpstack/group"/> -->
+     </component>
+     <component name="rtpstack" long-name="RTP Stack" origin-model="foundation">
+      <unit bldFile="mw/ipappprotocols/rtp/rtpstack/group"/>
+      <!-- <unit bldFile="mw/ipappprotocols/rtp/rtpstack/tsrc/ut_rtpstack/group"/> -->
+     </component>
+    </collection>
+    <collection name="sipplugins" long-name="SIP Plugins" level="plugin">
+     <component name="sippwlanplugin" long-name="SIP WLAN Plugin" origin-model="foundation">
+      <unit bldFile="mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
+     </component>
+     <component name="sippsipsettingsui" long-name="SIP Settings UI" origin-model="foundation">
+      <unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
+      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipsettingsui/tsrc/ut_sipsettingsui/group"/> -->
+     </component>
+     <component name="sippdevmgmtsipadapter" long-name="Device Management SIP Adapter" origin-model="foundation">
+      <unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
+      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/tsrc/ut_cnsmldmsipadapter/group"/> -->
+     </component>
+     <component name="sippsystemstatemonitor" long-name="SIP System State Monitor" origin-model="foundation">
+      <unit bldFile="mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
+     </component>
+     <component name="sippsipadapter" long-name="SIP Adapter" origin-model="foundation">
+      <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
+      <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/tsrc/ut_cwpsipadapter/group"/> -->
+     </component>
+    </collection>
+    <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
+     <component name="rtp" long-name="RTP" introduced="9.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- Real Time Data Protocol -->
+      <unit bldFile="mw/ipappprotocols/realtimenetprots/rtp/group" mrp="mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
+     </component>
+     <component name="sipfw" long-name="SIP Framework" introduced="9.2" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
+     </component>
+    </collection>
+    <collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
+     <component name="sipprovider" long-name="SIP Provider" introduced="tb91" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
+     </component>
+    </collection>
+    <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="server">
+     <component unofficial="yes" name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/group"/>
+     </component>
+     <component unofficial="yes" name="ipappprotocols_build" long-name="IP App Protocols Build" origin-model="foundation">
+      <unit bldFile="mw/ipappprotocols/group"/>
+     </component>
+    <component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="ipappsrv" long-name="IP App Services" tech_domain="vc" level="specific" levels="framework  generic server  conn plugin">
+    <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
+     <component name="mmccinterface" long-name="MMCC Interface" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccinterface/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccinterface/tsrc/ut_interface/group"/> -->
+     </component>
+     <component name="mmccjitterbuffer" long-name="Jitter Buffer" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/tsrc/ut_jitterbuffer/group"/> -->
+     </component>
+     <component name="mmccqoscontroller" long-name="QoS Controller" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/tsrc/ut_qoscontroller/group"/> -->
+     </component>
+     <component name="mmccmultiplexer" long-name="MMCC Multiplexer" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/tsrc/ut_multiplexer/group"/> -->
+     </component>
+     <component name="mmccsubcontroller" long-name="MMCC Subcontroller" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_rtpmediaclock/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/group"/> -->
+     </component>
+     <component name="mmcccontroller" long-name="MMCC Controller" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcccontroller/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcccontroller/tsrc/ut_controller/group"/> -->
+     </component>
+     <component name="mmccredpayloadformat" long-name="RED Payload Format" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/tsrc/ut_redpayloadformat/group"/> -->
+     </component>
+     <component name="mmccamrpayloadformat" long-name="AMR Payload Format" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/tsrc/ut_amrpayloadformat/group"/> -->
+     </component>
+     <component name="mmccg711payloadformat" long-name="G711 Payload Format" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/tsrc/ut_g711payloadformat/group"/> -->
+     </component>
+     <component name="mmccg729payloadformat" long-name="G729 Payload Format" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/tsrc/ut_g729payloadformat/group"/> -->
+     </component>
+     <component name="mmccilbcpayloadformat" long-name="ILBC Payload Format" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/tsrc/ut_ilbcpayloadformat/group"/> -->
+     </component>
+     <component name="mmccdtmfpayloadformat" long-name="DTMF Payload Format" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/tsrc/ut_dtmfpayloadformat/group"/> -->
+     </component>
+     <component name="mmccrtpsourcesink" long-name="RTP Source Sink" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/group"/> -->
+     </component>
+     <component name="mmccvideosourcesink" long-name="Video Source Sink" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/tsrc/ut_videosourcesink/group"/> -->
+     </component>
+     <component name="mmcch263payloadformat" long-name="H263 Payload Format" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/tsrc/ut_h263payloadformat/group"/> -->
+     </component>
+     <component name="mmccanypayloadformat" long-name="ANY Payload Format" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/tsrc/ut_anypayloadformat/group"/> -->
+     </component>
+     <component name="mmccfilesourcesink" long-name="MMCC File Source Sink" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/tsrc/ut_filesourcesink/group"/> -->
+     </component>
+     <component name="mmccanysourcesink" long-name="Anysource Sink" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/tsrc/ut_anysourcesink/group"/> -->
+     </component>
+     <component name="mmccavcpayloadformat" long-name="AVC Payload Format" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/tsrc/ut_avcpayloadformat/group"/> -->
+     </component>
+     <component unofficial="yes" name="multimediacommscontroller_build" long-name="Multimedia Comms Controller Build" origin-model="foundation">
+      <unit bldFile="mw/ipappsrv/multimediacommscontroller/group"/>
+     </component>
+     <component unofficial="yes" name="multimediacommscontroller_test" long-name="Multimedia Comms Controller Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/dptests/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/clienttests/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/componenttests/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/subcontrollerstub/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/jitterbuffertestconsole/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/rtpsourcesink/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpconsole/group"/> -->
+     </component>
+    </collection>
+    <collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
+     <component name="mmcecli" long-name="MMCE Client" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcecli/group"/> -->
+     </component>
+     <component name="mmcefloorctrlengine" long-name="MMCE Foor Control Engine" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin2/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/group"/> -->
+     </component>
+     <component name="mmcefloorctrlplugin" long-name="MMCE Foor Control Plugin" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/tsrc/ut_floorctrlplugin/group"/> -->
+     </component>
+     <component name="mmcesrv" long-name="MMCE Server" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/sip_stub/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmcemediamanager/tsrc/ut_mediamanager/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/mmcesrv/mmceserver/tsrc/ut_server/group"/> -->
+     </component>
+     <component unofficial="yes" name="multimediacommsengine_build" long-name="Multimedia Comms Engine Build" origin-model="foundation">
+      <unit bldFile="mw/ipappsrv/multimediacommsengine/group"/>
+     </component>
+     <component unofficial="yes" name="multimediacommsengine_test" long-name="Multimedia Comms Engine Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiplugin/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/ttcnresolverplugin/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiengine/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group/s60_public_sdk"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
+     </component>
+    </collection>
+    <collection name="natfw" long-name="NAT Framework" level="framework">
+     <component name="natfwsettings" long-name="NAT Framework Settings" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsettings/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsettings/tsrc/ut_cnatfwnatsettings/group"/> -->
+     </component>
+     <component name="natfwconnectionmultiplexer" long-name="NAT Framework Connection Multiplexer" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/muxtestconsole/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/ut_connectionmultiplexer/group"/> -->
+     </component>
+     <component name="natfwclient" long-name="NAT Framework Client" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwclient/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwclient/tsrc/ut_natfwclient/group"/> -->
+     </component>
+     <component name="natfwsocketmediaconnwrapper" long-name="Socket Media Connection Wrapper" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/tsrc/ut_socketmediaconnwrapper/group"/> -->
+     </component>
+     <component name="natfwunsaf_protocols" long-name="NAT Framework Unsaf Protocols" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_codec/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_transport/group"/> -->
+     </component>
+     <component name="natfwstunturnclient" long-name="NAT Framework Stun Turn Client" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunturnclient/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunturnclient/tsrc/ut_stunturnclient/group"/> -->
+     </component>
+     <component name="natfwstunserver" long-name="NAT Framework Stun Server" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunserver/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunserver/tsrc/ut_cnatfwstunsrv/group"/> -->
+     </component>
+     <component name="natfwicecandidatehandler" long-name="NAT Framework Ice Candidate Handler" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwicecandidatehandler/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group"/> -->
+     </component>
+     <component name="natfwstunplugin" long-name="NAT Framework STUN Plugin" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunplugin/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwstunplugin/tsrc/ut_cnatfwstunplugin/group"/> -->
+     </component>
+     <component name="natfwturnplugin" long-name="NAT Framework TURN Plugin" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwturnplugin/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natfw/natfwturnplugin/tsrc/ut_cnatfwturnplugin/group"/> -->
+     </component>
+     <component unofficial="yes" name="natfw_build" long-name="NAT Framework Build" origin-model="foundation">
+      <unit bldFile="mw/ipappsrv/natfw/group"/>
+     </component>
+     <component unofficial="yes" name="natfw_test" long-name="NAT Framework Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/ipappsrv/natfw/tsrc/natfwtestconsoles/natfwtestconsole/group"/> -->
+     </component>
+    </collection>
+    <collection name="natplugins" long-name="NAT Plugins" level="plugin">
+     <component name="natpcliprovisioningnatfwadapter" long-name="Client Provisioning NAT Framework Traversal Adapter" origin-model="foundation">
+      <unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
+      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/tsrc/t_natfwtraversaladapter/group"/> -->
+     </component>
+     <component name="natpdevmgmtnatfwadapter" long-name="Device Management NAT Framework Traversal Adapter" origin-model="foundation">
+      <unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
+      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/tsrc/ut_cnsmldmnatfwtraversaladapter/group"/> -->
+     </component>
+     <component name="natptraversalcontroller" long-name="NAT Traversal Controller" origin-model="foundation">
+      <unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
+      <!-- <unit bldFile="mw/ipappsrv/natplugins/natptraversalcontroller/tsrc/ut_nattraversalcontroller/group"/> -->
+     </component>
+     <component name="natpnatfwsdpprovider" long-name="NAT Framework SDP Provider" origin-model="foundation">
+      <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
+      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/testconsole/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/ut_natfwsdpprovider/group"/> -->
+     </component>
+    </collection>
+    <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
+     <component unofficial="yes" name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/ipappsrv/ipappsrv_plat/group"/>
+     </component>
+     <component unofficial="yes" name="ipappsrv_build" long-name="IP App Services Build" origin-model="foundation">
+      <unit bldFile="mw/ipappsrv/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="ipconnmgmt" long-name="IP Connectivity Management" tech_domain="dc" level="generic" levels="plugin framework server generic utils">
+    <collection name="alwayson_net_plugin" long-name="Always On Net Plugin" level="server">
+     <component name="pdpcontextmanager2" long-name="PDP Context Manager 2" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
+     </component>
+     <component unofficial="yes" name="alwayson_net_plugin_build" long-name="Always On Net Plugin Build" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/alwayson_net_plugin/group"/>
+     </component>
+    </collection>
+    <collection name="bearermanagement" long-name="Bearer Management" level="framework">
+     <component name="mpm" long-name="MPM" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/bearermanagement/mpm/group"/>
+     </component>
+     <component name="bearermanager" long-name="Bearer Manager" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/bearermanagement/bearermanager/group"/>
+     </component>
+     <component unofficial="yes" name="bearermanagement_build" long-name="Bearer Management Build" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/bearermanagement/group"/>
+     </component>
+    </collection>
+    <collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
+     <component name="connectionmonitorplugin" long-name="Connection Monitor Plugin" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
+     </component>
+     <component name="connectionmonitorui" long-name="Connection Monitor UI" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
+     </component>
+     <component name="connmon" long-name="Connection Monitor" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
+      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
+     </component>
+     <component name="connmonext" long-name="Connection Monitor Ext" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
+     </component>
+     <component unofficial="yes" name="connectionmonitoring_build" long-name="Connection Monitoring Build" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/connectionmonitoring/group"/>
+     </component>
+    </collection>
+    <collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
+     <component name="apcontrollistplugin" long-name="Access Point Control List Plugin" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
+     </component>
+    </collection>
+    <collection name="apengine" long-name="Application Engine" level="framework">
+     <component name="apeng" long-name="Access Point Engine" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/apengine/apeng/group"/>
+     </component>
+     <component name="apsettingshandlerui" long-name="Access Point Settings Handler UI" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
+     </component>
+     <component name="apsettingsplugin" long-name="Access Point Settings Plugin" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
+     </component>
+     <component unofficial="yes" name="apengine_build" long-name="Application Engine Build" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/apengine/group"/>
+     </component>
+    </collection>
+    <collection name="cmmanager" long-name="CM Manager" level="framework">
+     <component name="cmmgr" long-name="CM Manager" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/cmmanager/cmmgr/group"/>
+     </component>
+    </collection>
+    <collection name="dbcreator" long-name="DB Creator" level="utils">
+     <component name="commsdatcreator" long-name="Comms Database Creator" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
+     </component>
+     <component name="commsdatcreatorrfsplugin" long-name="Comms Database Creator RFS Pluginr" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
+     </component>
+     <component name="commsdatstartup" long-name="Comms Database Startup" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
+     </component>
+     <component name="dbcreatorexe" long-name="DB Creator" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
+     </component>
+     <component unofficial="yes" name="dbcreator_build" long-name="DB Creator Build" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/dbcreator/group"/>
+     </component>
+    </collection>
+    <collection name="connectionutilities" long-name="Connection Utilities" level="utils">
+     <component name="connectiondialogs" long-name="ConnectionDialogs" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
+     </component>
+    </collection>
+    <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
+     <component unofficial="yes" name="ipconnmgmt_build" long-name="IP Connectivity Management Build" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/group"/>
+     </component>
+     <component unofficial="yes" name="ipcm_pub" class="api" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/group"/>
+     </component>
+     <component unofficial="yes" name="ipcm_plat" class="api" origin-model="foundation">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="legacypresence" long-name="Legacy Presence Services" tech_domain="pr" level="specific" levels="engine fw ui">
+    <collection name="xdmengine" long-name="XDM Engine" level="engine">
+     <component name="xdmsettingsapi" long-name="XDM Settings Api" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmsettingsapi/group"/> -->
+     </component>
+     <component name="xdmprovisioning" long-name="XDM Provisioning" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmprovisioning/group"/> -->
+     </component>
+     <component name="xdmdevicemanagement" long-name="XDM Device Management" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmdevicemanagement/group"/> -->
+     </component>
+     <component name="xdmengine_build" long-name="XDM Engine" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/xdmengine/group"/>
+     </component>
+    </collection>
+    <collection name="xdmsettingsui" long-name="XDM Settings UI" level="ui">
+     <component name="xdmsettingsui_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/xdmsettingsui/help/group"/>
+     </component>
+     <component unofficial="yes" name="xdmsettingsui_build" long-name="XDM Settings UI Build" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/xdmsettingsui/group"/>
+     </component>
+    </collection>
+    <collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
+     <component name="msgconnmanager_build" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/msgconnmanager/group"/>
+     </component>
+    </collection>
+    <collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptor" level="fw">
+     <component name="simpleplugin" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
+     </component>
+    </collection>
+    <collection name="presencesettingsui" long-name="Presence Settings UI" level="ui">
+     <component name="presencesettingsui_help" long-name="Help" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/presencesettingsui/help/group"/>
+     </component>
+     <component unofficial="yes" name="presencesettingsui_build" long-name="Presence Settings UI Build" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/presencesettingsui/group"/>
+     </component>
+    </collection>
+    <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
+     <component name="presencesettingsapi" long-name="Presence Settings API" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/simpleengine/presencesettingsapi/group"/> -->
+     </component>
+     <component name="siputils" long-name="SIP Utils" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/simpleengine/siputils/group"/> -->
+     </component>
+     <component name="xmlutils" long-name="XML Utils" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/simpleengine/xmlutils/group"/> -->
+     </component>
+     <component name="simpleengine_engine" long-name="Engine" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/simpleengine/engine/group"/> -->
+     </component>
+     <component name="xdmrlspres" long-name="XDM Rlspres" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/simpleengine/xdmrlspres/group"/> -->
+     </component>
+     <component name="presencedm" long-name="Presence DM" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/simpleengine/presencedm/group"/> -->
+     </component>
+     <component name="presenceprovisioning" long-name="Presence Provisioning" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/simpleengine/presenceprovisioning/group"/> -->
+     </component>
+     <component unofficial="yes" name="simpleengine_build" long-name="SIMPLE Engine Build" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/simpleengine/group"/>
+     </component>
+    </collection>
+    <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
+     <component name="xdmxmlparser" long-name="XDM XML Parser" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xdmxmlparser/group"/> -->
+     </component>
+     <component name="xcapprotocol" long-name="Xcap Protocol" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/group"/> -->
+      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapappusage/group"/> -->
+      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/client/group"/> -->
+      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/server/group"/> -->
+      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcaphttptransport/group"/> -->
+      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapoperations/group"/> -->
+      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcaputils/group"/> -->
+     </component>
+     <component name="localprotocol" long-name="Local Protocol" origin-model="foundation">
+      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/group"/> -->
+      <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/localoperations/group"/> -->
+     </component>
+     <component unofficial="yes" name="xdmprotocols_build" long-name="XDM Protocols Build" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/xdmprotocols/group"/>
+     </component>
+    </collection>
+    <collection name="simpledatamodeladapter" long-name="SIMPLE Data Mode Aadapter" level="fw">
+     <component name="presenceplugin" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
+     </component>
+    </collection>
+    <collection name="legacypresence_info" long-name="Legacy Presence Services Info" level="ui">
+     <component unofficial="yes" name="pressrv_plat" class="api" origin-model="foundation">
+      <unit bldFile="mw/legacypresence/pressrv_plat/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="locationsrv" long-name="Location Services" tech_domain="lo" level="specific" levels="plugins fw interface">
+    <collection name="landmarks" long-name="Landmarks" level="fw">
+     <component name="locationlandmarks" long-name="Location Landmarks" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
+     </component>
+     <component unofficial="yes" name="landmarks_build" long-name="Landmarks Build" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/landmarks/group"/>
+     </component>
+    </collection>
+    <collection name="locationmapnavfw" long-name="Location Map Nav Framework" level="fw">
+     <component name="library" long-name="Library" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
+     </component>
+     <component name="aiwprovider" long-name="Application Inter-Working Provider" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
+     </component>
+     <component unofficial="yes" name="locationmapnavfw_build" long-name="Location Map Nav Framework Build" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
+     </component>
+    </collection>
+    <collection name="locationsystemui" long-name="Location System UI" level="interface">
+     <component name="locationsysui" long-name="Location Sys UI" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
+     </component>
+     <component unofficial="yes" name="locationsystemui_build" long-name="Location System UI Build" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationsystemui/group"/>
+     </component>
+    </collection>
+    <collection name="supl" long-name="SUPL" level="plugins">
+     <component name="locationsuplfw" long-name="Location SUPL Framework" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/supl/locationsuplfw/group"/>
+     </component>
+     <component name="locationomasuplprotocolhandler" long-name="Location OMA SUPL Protocol Handler" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
+     </component>
+     <component name="locationomasuplpostester" long-name="Location OMA SUPL Pos Tester" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/supl/locationomasuplpostester/group"/>
+     </component>
+     <component unofficial="yes" name="supl_build" long-name="SUPL Build" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/supl/group"/>
+     </component>
+    </collection>
+    <collection name="locationtriggering" long-name="Location Triggering" level="interface">
+     <component name="ltlogger" long-name="LT Logger" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/ltlogger/group"/>
+     </component>
+     <component name="ltclientlib" long-name="LT Client Lib" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/ltclientlib/group"/>
+     </component>
+     <component name="ltmanagementlib" long-name="LT Management Library" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
+     </component>
+     <component name="ltcontainer" long-name="LT Container" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/ltcontainer/group"/>
+     </component>
+     <component name="ltserver" long-name="LT Server" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/ltserver/group"/>
+     </component>
+     <component name="ltstrategypluginapi" long-name="LT Strategy Plugin API" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
+     </component>
+     <component name="ltstrategyengine" long-name="LT Strategy Engine" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
+     </component>
+     <component name="ltmovementdetectionpluginapi" long-name="Movement Detection Plugin API" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
+     </component>
+     <component name="ltcellidmovementdetector" long-name="Cell ID Movement Detector" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
+     </component>
+     <component name="lbtmgmtui" long-name="LBT Management UI" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
+     </component>
+     <component unofficial="yes" name="locationtriggering_test" long-name="Location Triggering Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreatetest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/createtest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/handlingprocesstest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity2_exe/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancellisttriggerstest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/createtest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity4_exe/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelgettriggerstest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/modifytest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity5_exe/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelsettriggerstest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/canceldeletetest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/deletetest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
+     </component>
+     <component unofficial="yes" name="locationtriggering_build" long-name="Location Triggering Build" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/locationtriggering/group"/>
+     </component>
+    </collection>
+    <collection name="locationsrv_info" long-name="Location Services Info" level="interface">
+     <component unofficial="yes" name="locsrv_plat" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <unit bldFile="mw/locationsrv/locsrv_plat/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="genericpositioningplugins" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
+     </component>
+     <component unofficial="yes" name="locationsrv_test" long-name="Location Services Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/locationsrv/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="locationsrv_build" long-name="Location Services Build" origin-model="foundation">
+      <unit bldFile="mw/locationsrv/group"/>
+     </component>
+     <component unofficial="yes" name="locsrv_pub" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
+      <unit bldFile="mw/locationsrv/locsrv_pub/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
+     </component>
+    </collection>
+   </block>
+   <block name="mds" long-name="Metadata Services" tech_domain="mm" level="specific" levels="mgr eng server int">
+    <collection name="clfwrapper" long-name="CLF Wrapper" level="int">
+     <component unofficial="yes" name="clfwrapper_build" long-name="CLF Wrapper Build" origin-model="foundation">
+      <unit bldFile="mw/mds/clfwrapper/group"/>
+     </component>
+    </collection>
+    <collection name="contextengine" long-name="Context Engine" level="eng">
+     <component name="contextengine_plugins" long-name="Plugins" origin-model="foundation">
+      <unit bldFile="mw/mds/contextengine/plugins/group"/>
+     </component>
+     <component unofficial="yes" name="contextengine_build" long-name="Context Engine Build" origin-model="foundation">
+      <unit bldFile="mw/mds/contextengine/group"/>
+     </component>
+    </collection>
+    <collection name="harvester" long-name="Harvester" level="eng">
+     <component name="blacklistclient" long-name="Blacklist Client" origin-model="foundation">
+      <unit bldFile="mw/mds/harvester/blacklistclient/group"/>
+     </component>
+     <component name="blacklistserver" long-name="Blacklist Server" origin-model="foundation">
+      <unit bldFile="mw/mds/harvester/blacklistserver/group"/>
+     </component>
+     <component name="harvester_common" long-name="Common" origin-model="foundation">
+      <unit bldFile="mw/mds/harvester/common/group"/>
+     </component>
+     <component name="composerplugins" long-name="Composer Plugins" origin-model="foundation">
+      <unit bldFile="mw/mds/harvester/composerplugins/group"/>
+     </component>
+     <component name="harvesterplugins" long-name="Harvester Plugins" origin-model="foundation">
+      <!-- <unit bldFile="mw/mds/harvester/harvesterplugins/audioplaylistplugin/group"/> -->
+      <unit bldFile="mw/mds/harvester/harvesterplugins/group"/>
+     </component>
+     <component name="monitorplugins" long-name="Monitor Plugins" origin-model="foundation">
+      <unit bldFile="mw/mds/harvester/monitorplugins/group"/>
+     </component>
+     <component name="harvester_server" long-name="Server" origin-model="foundation">
+      <unit bldFile="mw/mds/harvester/server/group"/>
+     </component>
+     <component name="harvester_client" long-name="Client" origin-model="foundation">
+      <unit bldFile="mw/mds/harvester/client/group"/>
+     </component>
+     <component unofficial="yes" name="harvester_build" long-name="Harvester Build" origin-model="foundation">
+      <unit bldFile="mw/mds/harvester/group"/>
+     </component>
+    </collection>
+    <collection name="locationmanager" long-name="Location Manager" level="mgr">
+     <component name="locationtrail" long-name="Location Trail" origin-model="foundation">
+      <unit bldFile="mw/mds/locationmanager/locationtrail/group"/>
+     </component>
+     <component name="locationmanager_server" long-name="Server" origin-model="foundation">
+      <unit bldFile="mw/mds/locationmanager/server/group"/>
+     </component>
+     <component name="locationmanager_client" long-name="Client" origin-model="foundation">
+      <unit bldFile="mw/mds/locationmanager/client/group"/>
+     </component>
+     <component unofficial="yes" name="locationmanager_build" long-name="Location Manager Build" origin-model="foundation">
+      <unit bldFile="mw/mds/locationmanager/group"/>
+     </component>
+    </collection>
+    <collection name="metadataengine" long-name="Metadata Engine" level="eng">
+     <component name="metadataengine_common" long-name="Common" origin-model="foundation">
+      <unit bldFile="mw/mds/metadataengine/common/group"/>
+     </component>
+     <component name="metadataengine_server" long-name="Server" origin-model="foundation">
+      <unit bldFile="mw/mds/metadataengine/server/group"/>
+     </component>
+     <component name="metadataengine_client" long-name="Client" origin-model="foundation">
+      <unit bldFile="mw/mds/metadataengine/client/group"/>
+     </component>
+     <component unofficial="yes" name="metadataengine_build" long-name="Metadata Engine Build" origin-model="foundation">
+      <unit bldFile="mw/mds/metadataengine/group"/>
+     </component>
+    </collection>
+    <collection name="watchdog" long-name="Watchdog" level="server">
+     <component name="mdswatchdog" origin-model="foundation">
+      <unit bldFile="mw/mds/watchdog/group"/>
+     </component>
+    </collection>
+    <collection name="iadstoprestart" long-name="IAD Stop Restart" level="server">
+     <component unofficial="yes" name="iadstoprestart_build" long-name="IAD Stop Restart Build" origin-model="foundation">
+      <!-- <unit bldFile="mw/mds/iadstoprestart/group"/> -->
+     </component>
+    </collection>
+    <collection name="mds_info" long-name="Metadata Services Info" level="int">
+     <component unofficial="yes" name="mds_pub" long-name="Metadata Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/mds/mds_pub/group"/>
+     </component>
+     <component unofficial="yes" name="mds_plat" long-name="Metadata Services Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
+      <unit bldFile="mw/mds/mds_plat/group"/>
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="mds_build" long-name="Metadata Services Build" origin-model="foundation">
+      <unit bldFile="mw/mds/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="messagingmw" long-name="Messaging Middleware" tech_domain="pr" level="specific" levels="stack fw api">
+    <collection name="msgbranched" long-name="Messaging Branched" level="fw">
+     <component name="msgbranched_build" origin-model="foundation">
+      <unit bldFile="mw/messagingmw/msgbranched/group"/>
+     </component>
+    </collection>
+    <collection name="messagingfw" long-name="Messaging FW" level="fw">
+     <component name="alwaysonline" long-name="Always Online" origin-model="foundation">
+      <!-- <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/alwaysonlinemanager/group"/> -->
+      <!-- <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/alwaysonlinestarterapp/group"/> -->
+      <unit bldFile="mw/messagingmw/messagingfw/alwaysonline/group"/>
+     </component>
+     <component name="msgcommonutils" long-name="Messaging Common Utils" origin-model="foundation">
+      <unit bldFile="mw/messagingmw/messagingfw/msgcommonutils/group"/>
+     </component>
+     <component name="senduiservices" long-name="Send UI Services" origin-model="foundation">
+      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/datautils/group"/> -->
+      <unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
+      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/launcher/group"/> -->
+      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/serviceresolver/group"/> -->
+      <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/watcher/group"/> -->
+     </component>
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="scheduledsendmtm">
+       <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendexe/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendmtm/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/test/group"/>
+     </component>-->
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="msgsrvnstore">
+       <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/group"/>
+       -  <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/test/group"/>  -
+       <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/server/group"/>
+       -  <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/server/test/testrom"/>  -
+       <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/serverexe/group"/>
+     </component>-->
+     <!--Component manually removed as empty and name conflicts with an OS component-->
+     <!--<component name="biomsgfw">
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bdb"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bifu"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bioc"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bios"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/biowatchers"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bits"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/biut"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/cbcp"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/enp"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/gfp"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/iacp"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/rom"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/t_biomsg/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/wapp"/>
+     </component>-->
+     <!--Component manually removed as empty and name conflicts with an OS component-->
+     <!--<component name="msgconf"/>-->
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="watcherfw">
+       <unit bldFile="mw/messagingmw/messagingfw/watcherfw/test/group"/>
+     </component>-->
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="msgtest">
+       <unit bldFile="mw/messagingmw/messagingfw/msgtest/integration/group"/>
+       -  <unit bldFile="mw/messagingmw/messagingfw/msgtest/targetautomation"/>  -
+       <unit bldFile="mw/messagingmw/messagingfw/msgtest/testsuites/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/msgtest/testutils/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/msgtest/tools/group"/>
+     </component>-->
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="biowatchers">
+       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmanbswatcher/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmasocketwatcher/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatchervmn/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwemt/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwmt/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwpt/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/biowatchers/test/group"/>
+     </component>-->
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="sendas">
+       <unit bldFile="mw/messagingmw/messagingfw/sendas/client/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/sendas/editutils/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/sendas/server/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/sendas/test/group"/>
+     </component>-->
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="msgurlhandler">
+       <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/test/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/urlhandler/group"/>
+     </component>-->
+     <!--Component manually removed and merged to OS-->
+     <!--<component name="wappushfw">
+       -  <unit bldFile="mw/messagingmw/messagingfw/wappushfw/examples/pushapphandlerex"/>  -
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/miscpushmsgutils/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/plugins/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/plugins/wapurilookup/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushmsgentry/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushmtm/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushutils/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushwatcher/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/roaptcontenthandler/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/rocontenthandler/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/rom"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/sislcontenthandlers/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/sislpushmsgutils/group"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpush"/>
+       <unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpushscriptbased"/>
+     </component>-->
+     <component name="suplsmshandler" origin-model="foundation"/>
+     <component name="suplwappushhandler" origin-model="foundation"/>
+    <component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
+     </component>
+     <component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
+     </component>
+     <component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/messagingmw/messagingfw/biomsgfw/group" mrp="mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
+     </component>
+     <component name="msgconf" long-name="Messaging Config" introduced="tb91" purpose="optional" class="config" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/messagingmw/messagingfw/msgconf/group" mrp="mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
+     </component>
+     <component name="watcherfw" long-name="Watcher Framework" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/messagingmw/messagingfw/watcherfw/group" mrp="mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
+     </component>
+     <component name="msgtest" long-name="Messaging Test" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/messagingmw/messagingfw/msgtest/group" mrp="mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
+     </component>
+     <component name="msgtests" long-name="Messaging Tests" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/messagingmw/messagingfw/msgtests/group/messaging.mrp"/>
+     </component>
+     <component name="msgtestfw" long-name="Messaging Test Framework" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/messagingmw/messagingfw/msgtestfw/group/messaging_testframework.mrp"/>
+     </component>
+     <component name="msgtestproduct" long-name="Messaging Test Product" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/messagingmw/messagingfw/msgtestproduct/group/messaging_testproduct.mrp"/>
+     </component>
+     <component name="biowatchers" long-name="BIO Watchers" introduced="8.0" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="mw/messagingmw/messagingfw/biowatchers/Group" mrp="mw/messagingmw/messagingfw/biowatchers/Group/messaging_biomsg_biowatchers_cdma.mrp"/>
+     </component>
+     <component name="sendas" long-name="Send As" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/messagingmw/messagingfw/sendas/group" mrp="mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
+     </component>
+     <component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/group" mrp="mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
+     </component>
+     <component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/messagingmw/messagingfw/wappushfw/group" mrp="mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
+     </component>
+     <component name="n:suplsmshandler" long-name="SUPL SMS Handler" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/> -->
+     </component>
+     <component name="n:suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
+     <component unofficial="yes" name="msgfw_pub" class="api" origin-model="foundation">
+      <unit bldFile="mw/messagingmw/msgfw_pub/group"/>
+      <!-- <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/> -->
+      <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="messagingmw_build" long-name="Messaging Middleware Build" origin-model="foundation">
+      <unit bldFile="mw/messagingmw/group"/>
+     </component>
+     <component unofficial="yes" name="msgfw_plat" class="api" origin-model="foundation">
+      <unit bldFile="mw/messagingmw/msgfw_plat/group"/>
+      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/tsrc/group"/>
+     </component>
+    <component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="metadatasrv" long-name="Legacy Metadata Services" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
+    <collection name="contentlistingframework" long-name="Content Listing Framework" level="framework">
+     <component unofficial="yes" name="contentlistingframework_build" long-name="Content Listing Framework Build" origin-model="foundation">
+      <unit bldFile="mw/metadatasrv/contentlistingframework/group"/>
+     </component>
+    </collection>
+    <collection name="mediamanagementuis" long-name="Media Management UIs" level="server">
+     <component name="mediastylegrid" long-name="Media Style Grid" origin-model="foundation">
+      <unit bldFile="mw/metadatasrv/mediamanagementuis/mediastylegrid/group"/>
+     </component>
+    </collection>
+    <collection name="mediamanagementutilities" long-name="Media Management utilities" level="generic">
+     <component name="mediafetch" long-name="Media Fetch" origin-model="foundation">
+      <unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
+     </component>
+    </collection>
+    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
+     <component unofficial="yes" name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/metadatasrv/metadatasrv_plat/group"/>
+     </component>
+     <component unofficial="yes" name="metadatasrv_build" long-name="Legacy Metadata Services Build" origin-model="foundation">
+      <unit bldFile="mw/metadatasrv/group"/>
+     </component>
+     <component unofficial="yes" name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="mmappfw" long-name="Multimedia App Framework" tech_domain="mm" level="specific" levels="empty fw utils">
+    <collection name="mmappcomponents" long-name="MM App Components" level="utils">
+     <component name="collectionhelper" long-name="Collection Helper" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mmappcomponents/collectionhelper/group"/>
+     </component>
+     <component name="playlistengine" long-name="Playlist Engine" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
+     </component>
+     <component name="mmappfwharvester" long-name="Harvester" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
+     </component>
+     <component name="mmappcommonui" long-name="MM App Common UI" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
+     </component>
+     <component name="mediaplayersettingsengine" long-name="Media Player Settings Engine" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
+     </component>
+     <component name="audiofetcher" long-name="UUDIO Fetcher" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mmappcomponents/audiofetcher/group"/>
+     </component>
+     <component name="asxparser" long-name="ASX Parser" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mmappcomponents/asxparser/group"/>
+      <!-- <unit bldFile="mw/mmappfw/mmappcomponents/asxparser/test"/> -->
+     </component>
+    </collection>
+    <collection name="mpx" long-name="MPX" level="fw">
+     <component name="commonframework" long-name="Common Framework" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
+     </component>
+     <component name="playbackframework" long-name="Playback Framework" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
+     </component>
+     <component name="mpxcollectionfw" long-name="Collection Framework" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
+     </component>
+     <component name="mpxviewfw" long-name="View Framework" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
+     </component>
+     <component unofficial="yes" name="mpx_build" long-name="MPX Build" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mpx/group"/>
+     </component>
+    </collection>
+    <collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="utils">
+     <component unofficial="yes" name="mmappfw_build" long-name="Multimedia App Framework Build" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/group"/>
+     </component>
+     <component unofficial="yes" name="mmappfw_test" long-name="Multimedia App Framework Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/mmappfw/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/tsrc/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="mmmw" long-name="Multimedia Middleware" tech_domain="mm" level="generic" levels="plugin framework server generic specific">
+    <collection name="radioutility" long-name="Radio Utility" level="generic">
+     <component name="radioserver" long-name="Radio Server" origin-model="foundation">
+      <unit bldFile="mw/mmmw/radioutility/radioserver/group"/>
+      <!-- <unit bldFile="mw/mmmw/radioutility/radioserver/server/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/radioutility/radioserver/session/group"/> -->
+     </component>
+     <component name="radio_utility" long-name="Radio Utility" origin-model="foundation">
+      <unit bldFile="mw/mmmw/radioutility/radio_utility/group"/>
+     </component>
+     <component name="fmpresetutility" long-name="FM Preset Utility" origin-model="foundation">
+      <unit bldFile="mw/mmmw/radioutility/fmpresetutility/group"/>
+     </component>
+     <component unofficial="yes" name="radioutility_build" long-name="Radio Utility Build" origin-model="foundation">
+      <unit bldFile="mw/mmmw/radioutility/group"/>
+     </component>
+    </collection>
+    <collection name="mtp" long-name="MTP" level="framework">
+     <component name="mtpserver" long-name="Mtp Server" origin-model="foundation"/>
+     <component name="mtpusbclass" long-name="MTP USB Class" origin-model="foundation"/>
+     <component name="install" long-name="Install" origin-model="foundation"/>
+    </collection>
+    <collection name="audioeffectsui" long-name="Audio Effects UI" level="specific">
+     <component name="equalizer" long-name="Equalizer" origin-model="foundation">
+      <unit bldFile="mw/mmmw/audioeffectsui/equalizer/group"/>
+     </component>
+     <component unofficial="yes" name="audioeffectsui_build" long-name="Audio Effects UI Build" origin-model="foundation">
+      <unit bldFile="mw/mmmw/audioeffectsui/group"/>
+     </component>
+    </collection>
+    <collection name="audioenhancements" long-name="Audio Enhancements" level="generic">
+     <component name="enhancedaudioplayerutility" long-name="Enhanced Media Client" origin-model="foundation">
+      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/audioplayer/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/audiostreaming/group"/> -->
+      <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/group"/>
+      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosource/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosourcefactory/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audioutility/group"/> -->
+     </component>
+     <component name="progressivedownload" long-name="Progressive Download" origin-model="foundation">
+      <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/group"/>
+      <!-- <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/progressivedownloadsource/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/audioenhancements/progressivedownload/progressivedownloadutility/group"/> -->
+     </component>
+     <component name="enhancedmediaclient" long-name="Enhanced Media Client" origin-model="foundation">
+      <unit bldFile="mw/mmmw/audioenhancements/enhancedmediaclient/group"/>
+     </component>
+     <component name="profilesettingsmonitor" long-name="Profile Settings Monitor" origin-model="foundation">
+      <unit bldFile="mw/mmmw/audioenhancements/profilesettingsmonitor/group"/>
+     </component>
+     <component name="voipaudioservices" long-name="VoIP Audio Services" origin-model="foundation">
+      <unit bldFile="mw/mmmw/audioenhancements/voipaudioservices/group"/>
+     </component>
+     <component name="configurationcomponentsfactory" long-name="Configuration Components Factory" origin-model="foundation">
+      <unit bldFile="mw/mmmw/audioenhancements/configurationcomponentsfactory/group"/>
+     </component>
+     <component name="audiooutputcontrolutility" long-name="Audio Output Control Utility" origin-model="foundation">
+      <unit bldFile="mw/mmmw/audioenhancements/audiooutputcontrolutility/group"/>
+     </component>
+     <component name="callaudiocontrol" long-name="Call Audio Control" origin-model="foundation">
+      <unit bldFile="mw/mmmw/audioenhancements/callaudiocontrol/group"/>
+     </component>
+     <component unofficial="yes" name="audioenhancements_build" long-name="Audio Enhancements Build" origin-model="foundation">
+      <unit bldFile="mw/mmmw/audioenhancements/group"/>
+     </component>
+    </collection>
+    <collection name="metadatautility" long-name="Metadata Utility" level="generic">
+     <component name="3gpextparserlib" origin-model="foundation"/>
+     <component name="3gpextparserlib_stub" origin-model="foundation">
+      <unit bldFile="mw/mmmw/metadatautility/3gpextparserlib_stub/group"/>
+     </component>
+     <component name="metadatautility_build" origin-model="foundation">
+      <unit bldFile="mw/mmmw/metadatautility/group"/>
+     </component>
+    </collection>
+    <collection name="advancedaudiocontroller" long-name="Advanced Audio Controller" level="plugin">
+     <component name="audiocontrollerpluginsvariant" long-name="Audio Controller Plugins Variant" origin-model="foundation">
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpdatasourceadapter/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontroller/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontrollerutility/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/datasourceadapter/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudioinput/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudiooutput/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/fileaudiooutput/group"/> -->
+      <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/group"/>
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/hxaudiorecognizer/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/metadatawrite/group"/> -->
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/group"/> -->
+     </component>
+     <component name="wavplaycontrollerplugin" long-name="WAV Play Controller Plugin" origin-model="foundation">
+      <unit bldFile="mw/mmmw/advancedaudiocontroller/wavplaycontrollerplugin/group"/>
+     </component>
+     <component unofficial="yes" name="advancedaudiocontroller_test" long-name="Advanced Audio Controller Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/mmmw/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/> -->
+     </component>
+     <component unofficial="yes" name="advancedaudiocontroller_build" long-name="Advanced Audio Controller Build" origin-model="foundation">
+      <unit bldFile="mw/mmmw/advancedaudiocontroller/group"/>
+     </component>
+    </collection>
+    <collection name="thumbnailengine" long-name="Thumbnail Engine" level="server">
+     <component name="tneengine" long-name="TNE Engine" origin-model="foundation">
+      <unit bldFile="mw/mmmw/thumbnailengine/group"/>
+     </component>
+    </collection>
+    <collection name="mmfw" long-name="Multimedia Framework" level="framework">
+     <component name="gstreamer" long-name="GStreamer" origin-model="foundation"/>
+     <component name="helix_stub" long-name="Helix Stub" origin-model="foundation">
+      <unit bldFile="mw/mmmw/mmfw/helix_stub/group"/>
+     </component>
+     <component unofficial="yes" name="mmfw_build" long-name="Multimedia Framework Build" origin-model="foundation">
+      <unit bldFile="mw/mmmw/mmfw/group"/>
+     </component>
+    </collection>
+    <collection name="mmmiddlewarefws" long-name="Multimedia Middleware Frameworks" level="server">
+     <component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group/multimedia_mmf.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmmiddlewareplugins" long-name="Multimedia Middleware Plugins" level="framework">
+     <component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/group_plugin" mrp="mw/mmmw/mmmiddlewarefws/mmfw/group_plugin/multimedia_mmf_plugin.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
+     <component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/mmmw/mmfwtest/mmfunittest/group/multimedia_unittest_mmf_source.mrp"/>
+     </component>
+     <component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/mmmw/mmfwtest/mmfintegrationtest/group/multimedia_inttest_mmf_source.mrp"/>
+     </component>
+     <component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group" mrp="mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group/multimedia_mmf_char.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
+     <component name="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group/multimedia_mvs_app.mrp"/>
+     </component>
+     <component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group" mrp="mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group/multimedia_mvs_agents.mrp"/>
+     </component>
+     <component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/mmmw/mmvalidationsuite/mvsintegrationtest/group/multimedia_inttest_mvs_source.mrp"/>
+     </component>
+    </collection>
+    <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
+     <component unofficial="yes" name="mmmw_build" long-name="Multimedia Middleware Build" origin-model="foundation">
+      <unit bldFile="mw/mmmw/group"/>
+     </component>
+     <component unofficial="yes" name="mmmw_test" long-name="Multimedia Middleware Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/mmmw/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/tsrc/group"/>
+     </component>
+    <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="mmuifw" long-name="Multimedia UI Framework" tech_domain="mm" level="specific" levels="mgr mdl util ui">
+    <collection name="alfwidgetutils" long-name="ALF Widget Utils" level="ui">
+     <component name="alfwidgetutils_build" long-name="ALF Widget Utils Component" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/alfwidgetutils/group"/>
+     </component>
+    </collection>
+    <collection name="mulwidgets" long-name="MUL Widgets" level="ui">
+     <component name="mullogging" long-name="Mul Logging" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mulwidgets/mullogging/group"/>
+     </component>
+     <component name="muldatamodel" long-name="Mul Data Model" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mulwidgets/muldatamodel/group"/>
+     </component>
+     <component name="mulwidgets_common" long-name="Common" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mulwidgets/common/group"/>
+     </component>
+     <component name="gesturehelper" long-name="Gesture Helper" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mulwidgets/gesturehelper/group"/>
+     </component>
+     <component name="mulcoverflowwidget" long-name="MUL Coverflow Widget" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
+     </component>
+     <component name="mulsliderwidget" long-name="Mul Slider Widget" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
+     </component>
+     <component name="alfviewwidget" long-name="ALF View Widget" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mulwidgets/alfviewwidget/group"/>
+     </component>
+     <component name="alfcontainerwidget" long-name="ALF Container Widget" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
+     </component>
+     <component name="alfscrollbarwidget" long-name="ALF Scrollbar Widget" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
+     </component>
+     <component unofficial="yes" name="mulwidgets_build" long-name="MUL Widgets Build" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mulwidgets/group"/>
+     </component>
+    </collection>
+    <collection name="osncore" long-name="OSN Core" level="util">
+     <component name="osncore_build" long-name="OSN Core" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/osncore/group"/>
+     </component>
+     
+    </collection>
+    <collection name="resourcepool" long-name="Resource Pool" level="util">
+     <component name="alfresourcepool" long-name="ALF Resource Pool" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/resourcepool/group"/>
+     </component>
+    </collection>
+    <collection name="widgetmodel" long-name="Widget Model" level="mdl">
+     <component name="alfwidgetmodel" long-name="ALF Widget Model" origin-model="foundation">
+      <!-- <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetmodel/group"/> -->
+     </component>
+     <component name="alfwidgetfactory" long-name="ALF Widget Factory" origin-model="foundation">
+      <!-- <unit bldFile="mw/mmuifw/widgetmodel/alfwidgetfactory/group"/> -->
+     </component>
+     <component unofficial="yes" name="widgetmodel_build" long-name="Widget Model Build" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/widgetmodel/group"/>
+     </component>
+    </collection>
+    <collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
+     <component unofficial="yes" name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/group"/>
+     </component>
+     <component unofficial="yes" name="mmuifw_build" long-name="Multimedia UI Framework Build" origin-model="foundation">
+      <unit bldFile="mw/mmuifw/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="netprotocols" long-name="High-level Internet Protocols" tech_domain="dc" level="generic" levels="plugin framework server generic specific">
+    <collection name="httpfilters" long-name="HTTP Filters" level="plugin">
+     <component name="httpfiltercommon" long-name="HTTP Filter Common" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
+     </component>
+     <component name="cookie" long-name="Cookie" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/httpfilters/cookie/group"/>
+     </component>
+     <component name="deflatefilter" long-name="Deflate Filter" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/httpfilters/deflatefilter/group"/>
+     </component>
+     <component name="httpfilteracceptheader" long-name="HTTP Filter Accept Header" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
+     </component>
+     <component name="httpfilterauthentication" long-name="HTTP Filter Authentication" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
+     </component>
+     <component name="httpfilterconnhandler" long-name="HTTP Filter Conn Handler" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
+     </component>
+     <component name="httpfilteriop" long-name="HTTP Filter Iop" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/httpfilters/httpfilteriop/group"/>
+     </component>
+     <component name="httpfilterproxy" long-name="HTTP Filter Proxy" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/httpfilters/httpfilterproxy/group"/>
+     </component>
+     <component name="uaproffilter" long-name="UAProf Filter" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/httpfilters/uaproffilter/group"/>
+     </component>
+     <component unofficial="yes" name="httpfilters_build" long-name="HTTP Filters Build" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/httpfilters/group"/>
+     </component>
+    </collection>
+    <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
+     <component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
+     </component>
+     <component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/netprotocols/applayerprotocols/httpexamples/group" mrp="mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
+     </component>
+     <component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
+     </component>
+     <component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/netprotocols/applayerprotocols/wapbase/Group" mrp="mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
+     </component>
+     <component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/netprotocols/applayerprotocols/ftpengine/group" mrp="mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
+     </component>
+     <component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/netprotocols/applayerprotocols/telnetengine/group" mrp="mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
+     </component>
+    </collection>
+    <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
+     <component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
+     </component>
+     <component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
+     </component>
+     <component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
+     </component>
+     <component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
+     </component>
+    </collection>
+    <collection name="n:wapstack" long-name="WAP Stack" level="plugin">
+     <component name="n:wapmessageapi" long-name="WAP Message API" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/netprotocols/wapstack/wapmessageapi/group" mrp="mw/netprotocols/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
+     <component unofficial="yes" name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
+     </component>
+     <component unofficial="yes" name="netprotocols_build" long-name="High-level Internet Protocols Build" origin-model="foundation">
+      <unit bldFile="mw/netprotocols/group"/>
+     </component>
+    <component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="networkingdm" long-name="Networking Device Management" tech_domain="dm" level="generic" levels="plugin framework server generic specific">
+    <collection name="clientprovisioning" long-name="Client Provisioning" level="specific">
+     <component name="accesspointadapter" long-name="Access Point Adapter" origin-model="foundation">
+      <unit bldFile="mw/networkingdm/clientprovisioning/accesspointadapter/group"/>
+     </component>
+     <component name="cpdestinationnwadapter" long-name="CP Destination NW Adapter" origin-model="foundation">
+      <unit bldFile="mw/networkingdm/clientprovisioning/cpdestinationnwadapter/group"/>
+     </component>
+     <component unofficial="yes" name="clientprovisioning_build" long-name="Client Provisioning Build" origin-model="foundation">
+      <unit bldFile="mw/networkingdm/clientprovisioning/group"/>
+     </component>
+    </collection>
+    <collection name="devicemanagement" long-name="Device Management" level="specific">
+     <component name="globalwlansettings" long-name="Global WLAN Settings" origin-model="foundation">
+      <unit bldFile="mw/networkingdm/devicemanagement/globalwlansettings/group"/>
+     </component>
+     <component name="nsmldinternet" long-name="NSMLD Internet" origin-model="foundation">
+      <unit bldFile="mw/networkingdm/devicemanagement/nsmldinternet/group"/>
+     </component>
+     <component name="nsmldmalwaysonadapter" long-name="Nsmldm Always On Adapter" origin-model="foundation">
+      <unit bldFile="mw/networkingdm/devicemanagement/nsmldmalwaysonadapter/group"/>
+     </component>
+     <component name="nsmldmbmadapter" long-name="NSMLDM BM Adapter" origin-model="foundation">
+      <unit bldFile="mw/networkingdm/devicemanagement/nsmldmbmadapter/group"/>
+     </component>
+     <component unofficial="yes" name="devicemanagement_build" long-name="Device Management Build" origin-model="foundation">
+      <unit bldFile="mw/networkingdm/devicemanagement/group"/>
+     </component>
+    </collection>
+    <collection name="networkingdm_info" long-name="Networking Device Management Info" level="specific">
+     <component unofficial="yes" name="networkingdm_build" long-name="Networking Device Management Build" origin-model="foundation">
+      <unit bldFile="mw/networkingdm/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="opensrv" long-name="Open Services" tech_domain="rt" level="specific" levels="prt lib server eng">
+    <collection name="loudmouth" long-name="Loudmouth" level="prt">
+     <component name="loudmouth_build" origin-model="foundation">
+      <unit bldFile="mw/opensrv/loudmouth/group"/>
+     </component>
+     <component unofficial="yes" name="loudmouth_test" long-name="Loudmouth Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/opensrv/loudmouth/tsrc/group"/> -->
+     </component>
+    </collection>
+    <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
+     <component name="libtelepathy_build" origin-model="foundation">
+      <unit bldFile="mw/opensrv/libtelepathy/group"/>
+     </component>
+     <component unofficial="yes" name="libtelepathy_test" long-name="Telepathy Library Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/opensrv/libtelepathy/tsrc/group"/> -->
+     </component>
+    </collection>
+    <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
+     <component unofficial="yes" name="telepathygabble_build" long-name="Telepathy Gabble Build" origin-model="foundation">
+      <unit bldFile="mw/opensrv/telepathygabble/group"/>
+     </component>
+    </collection>
+    <collection name="isolationserver" long-name="Isloation Server" level="server">
+     <component name="messagequeue" long-name="Message Queue" origin-model="foundation">
+      <unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
+     </component>
+     <component name="isoserver" long-name="ISO Server" origin-model="foundation">
+      <unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
+     </component>
+     <component unofficial="yes" name="isolationserver_test" long-name="Isloation Server Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/opensrv/isolationserver/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="isolationserver_build" long-name="Isloation Server Build" origin-model="foundation">
+      <unit bldFile="mw/opensrv/isolationserver/group"/>
+     </component>
+    </collection>
+    <collection name="opensrv_info" long-name="Open Services Info" level="eng">
+     <component unofficial="yes" name="opensrv_plat" long-name="Open Services Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/opensrv/opensrv_plat/group"/>
+      <!-- <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="opensrv_build" long-name="Open Services Build" origin-model="foundation">
+      <unit bldFile="mw/opensrv/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="phonesrv" long-name="Telephony and SIM Services" tech_domain="vc" level="specific" levels="plugin framework server generic specific">
+    <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
+     <component name="phonecmdhnlr" long-name="Phone Command Handler" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
+     </component>
+    </collection>
+    <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
+     <component name="cbsserver" long-name="CBS Server" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
+     </component>
+     <component name="cbsui" long-name="CBS UI" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/cbs/cbsui/group"/>
+     </component>
+    </collection>
+    <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
+     <component name="callprovider" long-name="Call Provider" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
+     </component>
+     <component name="cce" long-name="CCE" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/convergedcallengine/cce/group"/>
+     </component>
+     <component name="spsettings" long-name="SP Settings" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group"/>
+      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
+     </component>
+     <component name="cenrepdatabase" long-name="Cenrep Database" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
+     </component>
+     <component name="serviceselector" long-name="Service Selector" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
+     </component>
+     <component name="csplugin" long-name="CS Plugin" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/convergedcallengine/csplugin/group"/>
+     </component>
+     <component unofficial="yes" name="convergedcallengine_build" long-name="Converged Call Engine Build" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/convergedcallengine/group"/>
+     </component>
+    </collection>
+    <collection name="networkhandling" long-name="Network Handling" level="plugin">
+     <component name="networkhandlingengine" long-name="Network Handling Engine" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
+     </component>
+    </collection>
+    <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
+     <component name="enpolicy" long-name="En Policy" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
+     </component>
+     <component name="aiwdialdata" long-name="AIW Dial Data" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
+     </component>
+     <component name="dialutils" long-name="Dial Utils" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group"/>
+     </component>
+     <component name="phoneclient" long-name="Phone Client" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group"/>
+     </component>
+     <component name="phoneserver" long-name="Phones Erver" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
+     </component>
+     <component name="callui" long-name="Call UI" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
+     </component>
+    </collection>
+    <collection name="satengine" long-name="Sat Engine" level="generic">
+     <component name="satserver" long-name="Sat Server" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/satengine/satserver/group"/>
+     </component>
+     <component unofficial="yes" name="satengine_build" long-name="Sat Engine Build" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/satengine/group"/>
+     </component>
+    </collection>
+    <collection name="satui" long-name="Sat UI" level="specific">
+     <component name="satapp" long-name="Sat App" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/satui/satapp/group"/>
+     </component>
+     <component name="satplugin" long-name="Sat Plugin" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/satui/satplugin/group"/>
+     </component>
+     <component unofficial="yes" name="satui_build" long-name="Sat UI Build" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/satui/group"/>
+     </component>
+    </collection>
+    <collection name="telutils" long-name="Utilities" level="generic">
+     <component name="phoneparser" long-name="Phone Parser" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
+     </component>
+     <component name="telephonyservice" long-name="Telephony Service" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
+     </component>
+    </collection>
+    <collection name="cellular" long-name="Cellular" level="server">
+     <component name="telephonysettings" long-name="Telephony Settings" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
+     </component>
+     <component name="sssettings" long-name="SS Settings" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
+     </component>
+     <component name="psetnotesui" long-name="Pset Notes UI" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
+     </component>
+     <component name="servicerequest" long-name="Service Request" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
+     </component>
+    </collection>
+    <collection name="engines" long-name="Telephony Engines" level="specific">
+     <component name="vmbxengine" long-name="Voice Mailbox Engine" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/engines/vmbxengine/group"/>
+     </component>
+    </collection>
+    <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
+     <component unofficial="yes" name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
+      <unit bldFile="mw/phonesrv/phonesrv_plat/group"/>
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="phonesrv_pub" long-name="Telephony and SIM Services Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/phonesrv_pub/group"/>
+     </component>
+     <component unofficial="yes" name="phonesrv_build" long-name="Telephony and SIM Services Build" origin-model="foundation">
+      <unit bldFile="mw/phonesrv/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="remoteconn" long-name="Remote Connectivity" tech_domain="de" level="generic" levels="plugin framework server generic specific">
+    <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
+     <component name="secon" long-name="Se Con" origin-model="foundation">
+      <unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
+     </component>
+    </collection>
+    <collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
+     <component unofficial="yes" name="remoteconn_build" long-name="Remote Connectivity Build" origin-model="foundation">
+      <unit bldFile="mw/remoteconn/group"/>
+     </component>
+     <component unofficial="yes" name="remoteconn_plat" long-name="Remote Connectivity Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/remoteconn/remoteconn_plat/group"/>
+     </component>
+    <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
+     </component>
+     <component name="n:connectivitydoc" long-name="Connectivity Documentation" introduced="tb91" purpose="optional" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/remoteconn/remoteconn_info/connectivitydoc/group/connectivity_documentation.mrp"/>
+     </component>
+     <component name="n:mtpdoc" long-name="MTP Documentation" introduced="tb91" purpose="optional" class="doc" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/remoteconn/remoteconn_info/mtpdoc/group/mtp_documentation.mrp"/>
+     </component>
+    </collection>
+   <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
+     <component name="n:mrouter" long-name="m-Router" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remoteconn/connectivitytransports/mrouter/group" mrp="mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/> -->
+     </component>
+     <component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/connectivitytransports/plpremotelink/group" mrp="mw/remoteconn/connectivitytransports/plpremotelink/group/connectivity_legacy_plp_plpremotelink.mrp"/>
+     </component>
+     <component name="plpvariant" long-name="PLP Variant" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/connectivitytransports/plpvariant/group" mrp="mw/remoteconn/connectivitytransports/plpvariant/group/connectivity_legacy_plp_plpvariant.mrp"/>
+     </component>
+     <component name="eventbroadcast" long-name="Event Broadcast" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/connectivitytransports/eventbroadcast/group" mrp="mw/remoteconn/connectivitytransports/eventbroadcast/group/connectivity_legacy_brdcst.mrp"/>
+     </component>
+    </collection>
+    <collection name="mtptransports" long-name="MTP Transports" level="plugin">
+     <component name="mtpusbtransport" long-name="MTP USB Transport" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
+     </component>
+    </collection>
+    <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
+     <component name="n:mtpfw" long-name="MTP Framework" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/> -->
+     </component>
+     <component name="mtpintegrationtest" long-name="MTP Integration Test" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/mtpfws/mtpintegrationtest/group" mrp="mw/remoteconn/mtpfws/mtpintegrationtest/group/mtp_test.mrp"/>
+     </component>
+    </collection>
+    <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
+     <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
+     </component>
+     <component name="n:mtpwmpextndp" long-name="WMP Extension Data Provider" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remoteconn/mtpdataproviders/mtpwmpextndp/group" mrp="mw/remoteconn/mtpdataproviders/mtpwmpextndp/group/mtp_wmpextndp.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
+     <component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/backupandrestore/backupengine/group" mrp="mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
+     </component>
+     <component name="backuptest" long-name="Backup Test" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/backupandrestore/backuptest/group" mrp="mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
+     </component>
+    </collection>
+    <collection name="connectivitypcside" long-name="Connectivity PC Side" level="generic">
+     <component name="chatscripts" long-name="Chat Scripts" purpose="development" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/connectivitypcside/chatscripts/group" mrp="mw/remoteconn/connectivitypcside/chatscripts/group/testtools_chatscripts.mrp"/>
+     </component>
+     <component name="n:connectqi" long-name="ConnectQI" introduced="9.1" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/remoteconn/connectivitypcside/connectqi/connectqisdk_mr3.mrp"/>
+     </component>
+     <component name="n:connectqisdk" long-name="ConnectQI SDK" introduced="9.1" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/remoteconn/connectivitypcside/connectqisdk/connectqisdk_public.mrp"/>
+     </component>
+    </collection>
+    <collection name="connectivitydevicefws" long-name="Connectivity Device Frameworks" level="framework">
+     <component name="connectivityfw" long-name="Connectivity Framework" introduced="7.0s" deprecated="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/connectivitydevicefws/connectivityfw/group" mrp="mw/remoteconn/connectivitydevicefws/connectivityfw/group/connectivity_framework.mrp"/>
+     </component>
+     <component name="connectivityservices" long-name="Connectivity Services" introduced="7.0s" deprecated="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/remoteconn/connectivitydevicefws/connectivityservices/group" mrp="mw/remoteconn/connectivitydevicefws/connectivityservices/group/connectivity_services.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="remotemgmt" long-name="Remote Management" tech_domain="dm" level="specific" levels="plugin framework server generic specific">
+    <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
+     <component name="pnputil" long-name="PnP Util" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
+      <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
+     </component>
+     <component name="provisioning" long-name="provisioning" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
+      <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/tsrc/moduletest/group"/> -->
+     </component>
+    </collection>
+    <collection name="policymanagement" long-name="Policy Management" level="generic">
+     <component name="pmdmadapter" long-name="PMDM Adapter" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
+     </component>
+     <component name="dmutilserver" long-name="DM Util Server" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
+     </component>
+     <component name="policyengine" long-name="Polic Eengine" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
+     </component>
+     <component unofficial="yes" name="policymanagement_build" long-name="Policy Management Build" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/policymanagement/group"/>
+     </component>
+    </collection>
+    <collection name="syncmlfw" long-name="SyncML Framework" level="server">
+     <component name="syncmlfw_common" long-name="Common" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/alerthandler/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/alertqueue/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/debug/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/historylog/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/http/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/inc"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/inc/modifiedheaders"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/inc/policy"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/inc/symbianheaders"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/notifiers/inc"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexclient/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexcommserver/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexdmplugin/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexdsplugin/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/obex/obexserverbinding/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver_clientapi/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver_privateapi/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/sosserver_transporthandler/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/syncagent/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/transport/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/wbxml/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/common/xml/bld"/>
+     </component>
+     <component name="ds" long-name="DS" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/adapterlog/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/adapters/dataproviderbase/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/agentlog/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/alerthandler/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/changefinder/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/dbcaps/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/filter/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/filterutils/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/profileutil/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/dsutils/storeformat/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/hostserver/dshostclient/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/hostserver/dshostserverbase/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/hostserver/dshostservers/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/inc"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/netmon/bld"/>
+      <!-- <unit bldFile="mw/remotemgmt/syncmlfw/ds/ota/bld"/> -->
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/provisioningadapter/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/settings/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/syncagent/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/ds/wappushalert/bld"/>
+     </component>
+     <component name="dm" long-name="DM" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/callbackserver/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/dmutils/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/hostserver/dmhostserverbase/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/hostserver/dmhostservers/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/provisioningadapter/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/settings/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/syncagent/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/treedbclient/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/treedbhandler/bld"/>
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/treemodule/bld"/>
+      <!-- <unit bldFile="mw/remotemgmt/syncmlfw/dm/tsrc/group"/> -->
+      <unit bldFile="mw/remotemgmt/syncmlfw/dm/wappushalert/bld"/>
+     </component>
+     <component name="syncmlnotifier" long-name="SyncML Notifier" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/syncmlfw/syncmlnotifier/group"/>
+     </component>
+     <component name="syncservice" long-name="Sync Service" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/syncmlfw/syncservice/group"/>
+     </component>
+     <component unofficial="yes" name="syncmlfw_build" long-name="SyncML Framework Build" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/syncmlfw/group"/>
+     </component>
+    </collection>
+    <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
+     <component name="scp" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
+      <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
+      <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
+      <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
+      <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
+     </component>
+     <component name="terminalsecurity_client" long-name="Client" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
+     </component>
+     <component name="terminalsecurity_server" long-name="Server" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
+     </component>
+     <component name="tcadapter" long-name="TC Adapter" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
+     </component>
+     <component unofficial="yes" name="terminalsecurity_build" long-name="Terminal Security Build" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
+     </component>
+    </collection>
+    <collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
+     <component name="diagframework" long-name="Diagnostics Framework" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
+     </component>
+     <component name="diagpluginbase" long-name="Diagnostics Plugin Base" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
+     </component>
+     <component name="diagresultsdb" long-name="Diagnostics Results DB" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
+      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
+     </component>
+     <component unofficial="yes" name="devicediagnosticsfw_build" long-name="Device Diagnostics Framework Build" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
+     </component>
+    </collection>
+    <collection name="n:remotemgmttest" long-name="Remote Management Test" level="specific">
+     <component name="n:omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/> -->
+     </component>
+     <component name="n:omadevicemgmtintegrationtest" long-name="OMA Device Management Integration Test" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="n:syncandremotemgmtfw" long-name="Sync and Remote Management Framework" level="framework">
+     <component name="n:omasyncmldatasync" long-name="OMA SyncML Data Sync" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/> -->
+     </component>
+     <component name="n:omasyncmlcommonfw" long-name="OMA SyncML Common Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/> -->
+     </component>
+     <component name="n:omasyncmldminterface" long-name="OMA SyncML DM Interface" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/> -->
+     </component>
+     <component name="n:omasyncmlconfig" long-name="OMA SyncML Config" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/> -->
+     </component>
+     <component name="n:devicemgmtfw" long-name="Device Management Framework" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/> -->
+     </component>
+     <component name="n:clientprovisioningfw" long-name="Client Provisioning Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="n:syncandremotemgmtservices" long-name="Sync and Remote Management Services" level="plugin">
+     <component name="n:datasyncadaptors" long-name="Data Sync Adaptors" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/> -->
+     </component>
+     <component name="n:devicemgmtadaptors" long-name="Device Management Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/> -->
+     </component>
+     <component name="n:clientprovisioningadaptors" long-name="Client Provisioning Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/> -->
+     </component>
+    </collection>
+    <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
+     <component unofficial="yes" name="remotemgmt_build" long-name="Remote Management Build" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/group"/>
+     </component>
+     <component unofficial="yes" name="remotemgmt_pub" long-name="Remote Management Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/remotemgmt/remotemgmt_pub/group"/>
+     </component>
+     <component unofficial="yes" name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/group"/>
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
+     </component>
+    <component name="n:remotemgmt_metadata" long-name="Remote Management Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/remotemgmt/remotemgmt_info/remotemgmt_metadata/remotemgmt_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="remotestorage" long-name="Remote Storage" tech_domain="de" level="generic" levels="framework">
+    <collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
+     <component name="mountstore" long-name="Mount Store" origin-model="foundation">
+      <unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
+     </component>
+     <component name="rsfwnotifierplugins" long-name="RS Framework Notifier Plugins" origin-model="foundation">
+      <unit bldFile="mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
+     </component>
+     <component name="remotefileengine" long-name="Remote File Engine" origin-model="foundation">
+      <unit bldFile="mw/remotestorage/remotestoragefw/remotefileengine/group"/>
+     </component>
+     <component name="mountmanager" long-name="Mount Manager" origin-model="foundation">
+      <unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/group"/>
+      <!-- <unit bldFile="mw/remotestorage/remotestoragefw/mountmanager/tsrc/public/basic/group"/> -->
+     </component>
+     <component name="webdavaccessplugin" long-name="WebDAV Access Plugin" origin-model="foundation">
+      <unit bldFile="mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
+     </component>
+     <component name="remotefilesystemplugin" long-name="Remote Filesystem Plugin" origin-model="foundation">
+      <unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
+     </component>
+     <component name="remotestoragegsplugin" long-name="GS Plugin" origin-model="foundation">
+      <unit bldFile="mw/remotestorage/remotestoragefw/gsplugin/group"/>
+     </component>
+     <component name="remotedriveconfigurationbiocontrol" long-name="Remote Drive Configuration BIO Control" origin-model="foundation">
+      <unit bldFile="mw/remotestorage/remotestoragefw/remotedriveconfigurationbiocontrol/group"/>
+     </component>
+     <component unofficial="yes" name="remotestoragefw_build" long-name="Remote Storage Framework Build" origin-model="foundation">
+      <unit bldFile="mw/remotestorage/remotestoragefw/group"/>
+     </component>
+    </collection>
+    <collection name="remotestorage_info" long-name="Remote Storage Info" level="framework">
+     <component unofficial="yes" name="rsfw_plat" class="api" origin-model="foundation">
+      <unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="securitysrv" long-name="Security Services" tech_domain="se" level="generic" levels="plugin framework server generic specific">
+    <collection name="gba" long-name="Generic Boot Architecture" level="specific">
+     <component name="uicc" long-name="Uicc" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/gba/uicc/group"/>
+     </component>
+     <component name="bootstrap" long-name="Bootstrap" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/gba/bootstrap/group"/>
+     </component>
+     <component name="gbaserver" long-name="GBA Server" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
+     </component>
+     <component name="gbaapi" long-name="GBA API" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
+     </component>
+     <component name="gbafilter" long-name="GBA Filter" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
+     </component>
+     <component unofficial="yes" name="gba_build" long-name="Generic Boot Architecture Build" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/gba/group"/>
+     </component>
+    </collection>
+    <collection name="wim" long-name="WIM" level="framework">
+     <component name="swimreader" long-name="Swim Reader" origin-model="foundation"/>
+     <component name="scard" long-name="S Card" origin-model="foundation"/>
+     <component name="wimutil" long-name="WIM Util" origin-model="foundation"/>
+     <component name="wimserver" long-name="WIM Server" origin-model="foundation"/>
+     <component name="wimclient" long-name="WIM Client" origin-model="foundation"/>
+     <component name="wimplugin" long-name="WIM Plugin" origin-model="foundation"/>
+     <component unofficial="yes" name="wim_build" long-name="WIM Build" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/wim/group"/>
+     </component>
+    </collection>
+    <collection name="cms" long-name="Certificate Management Services" level="generic">
+     <component name="cms_build" long-name="CMS" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/cms/group"/>
+     </component>
+    </collection>
+    <collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
+     <component name="x509certnameparser" long-name="X509cert Name Parser" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
+     </component>
+     <component name="pkcs12" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
+     </component>
+     <component name="certmanui" long-name="Certman UI" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
+     </component>
+     <component name="ctsecuritydialogs" long-name="CT Security Dialogs" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
+     </component>
+     <component name="certsaver" long-name="Cert Saver" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
+     </component>
+     <component name="secmodui" long-name="Sec Mod UI" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
+     </component>
+     <component name="devicetoken" long-name="Device Token" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
+     </component>
+     <component name="certificates" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/pkiutilities/certificates/group"/>
+     </component>
+     <component name="certificates_oem" origin-model="foundation"/>
+     <component unofficial="yes" name="pkiutilities_build" long-name="PKI Utilities Build" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/pkiutilities/group"/>
+     </component>
+    <component name="ocsp" long-name="Online Certificate Status Protocol" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/securitysrv/pkiutilities/ocsp/group" mrp="mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
+     </component>
+    </collection>
+    <collection name="remotelock" long-name="Remote Lock" level="server">
+     <component name="remotelocksettings" long-name="Remote Lock Settings" origin-model="foundation"/>
+     <component name="remotelockengine" long-name="Remote Lock Engine" origin-model="foundation"/>
+     <component unofficial="yes" name="remotelock_build" long-name="Remote Lock Build" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/remotelock/group"/>
+     </component>
+    </collection>
+    <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
+     <component name="trkdummy" long-name="Trk Dummy" origin-model="foundation">
+      <!-- <unit bldFile="mw/securitysrv/boottimeintegritycheck/trkdummy/group"/> -->
+     </component>
+     <component unofficial="yes" name="boottimeintegritycheck_build" long-name="Boot Time Integrity Check Build" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/boottimeintegritycheck/group"/>
+     </component>
+    </collection>
+    <collection name="securitydialogs" long-name="Security Dialogs" level="specific">
+     <component name="keylockpolicyapi" long-name="Keylock Policy Api" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
+     </component>
+     <component name="autolock" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
+     </component>
+     <component name="secui" long-name="Sec UI" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
+     </component>
+     <component name="securitynotifier" long-name="Security Notifier" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
+     </component>
+     <component name="securityobserver" long-name="Security Observer" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/securitydialogs/securityobserver/group"/>
+     </component>
+     <component unofficial="yes" name="securitydialogs_build" long-name="Security Dialogs Build" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/securitydialogs/group"/>
+     </component>
+    </collection>
+    <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
+     <component unofficial="yes" name="securitysrv_build" long-name="Security Services Build" origin-model="foundation">
+      <unit bldFile="mw/securitysrv/group"/>
+     </component>
+     <component unofficial="yes" name="secsrv_plat" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/> -->
+      <unit bldFile="mw/securitysrv/secsrv_plat/group"/>
+      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/> -->
+      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/> -->
+     </component>
+     <component unofficial="yes" name="securitysrv_test" long-name="Security Services Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/securitysrv/tsrc/group"/> -->
+     </component>
+    <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
+   <block name="serviceapi" long-name="Service API" tech_domain="rt" level="specific" levels="os mw1 mw2 app">
+    <collection name="sapi_applicationmanager" long-name="SAPI Application Manager" level="mw1">
+     <component name="appmanagerservice" long-name="App Manager Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_applicationmanager_build" long-name="SAPI Application Manager Build" origin-model="foundation">
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
+     </component>
+    </collection>
+    <collection name="sapi_calendar" long-name="SAPI Calendar" level="app">
+     <component name="calendarservice" long-name="Calendar Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_calendar_build" long-name="SAPI Calendar Build" origin-model="foundation">
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group"/> -->
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
+     </component>
+    </collection>
+    <collection name="sapi_contacts_vpbk" long-name="SAPI Contacts Vpbk" level="app">
+     <component name="contactservice" long-name="Contact Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_contacts_vpbk_build" long-name="SAPI Contacts Vpbk Build" origin-model="foundation">
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
+     </component>
+    </collection>
+    <collection name="sapi_landmarks" long-name="SAPI Landmarks" level="mw2">
+     <component name="landmarksservice" long-name="Landmarks Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_landmarks_build" long-name="SAPI Landmarks Build" origin-model="foundation">
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
+     </component>
+    </collection>
+    <collection name="sapi_location" long-name="SAPI Location" level="mw2">
+     <component name="locationservice" long-name="Location Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_location_build" long-name="SAPI Location Build" origin-model="foundation">
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetloc/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/group"/> -->
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
+     </component>
+    </collection>
+    <collection name="sapi_logging" long-name="SAPI Logging" level="app">
+     <component name="loggingservice" long-name="Logging Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_logging_build" long-name="SAPI Logging Build" origin-model="foundation">
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/tsrc/dev/group"/> -->
+     </component>
+    </collection>
+    <collection name="sapi_mediamanagement" long-name="SAPI Media Management" level="mw2">
+     <component name="mediamanagementservice" long-name="Media Management Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_mediamanagement_build" long-name="SAPI Media Management Build" origin-model="foundation">
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group"/> -->
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group"/> -->
+     </component>
+    </collection>
+    <collection name="sapi_messaging" long-name="SAPI Messaging" level="mw2">
+     <component name="messagingservice" long-name="Messaging Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_messaging_build" long-name="SAPI Messaging Build" origin-model="foundation">
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/status/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
+     </component>
+    </collection>
+    <collection name="sapi_sensor" long-name="SAPI Sensor" level="mw1">
+     <component name="sensorservice" long-name="Sensor Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_sensor_build" long-name="SAPI Sensor Build" origin-model="foundation">
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
+     </component>
+    </collection>
+    <collection name="sapi_sysinfo" long-name="SAPI Sysinfo" level="mw1">
+     <component name="sysinfoservice" long-name="Sysinfo Service" origin-model="foundation"/>
+     <component unofficial="yes" name="sapi_sysinfo_build" long-name="SAPI Sysinfo Build" origin-model="foundation">
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
+     </component>
+    </collection>
+    <collection name="sapi_serviceregistry" long-name="SAPI Service Registry" level="os">
+     <component name="serviceregistryprovider" origin-model="foundation">
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
+      <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+     </component>
+    </collection>
+    <collection name="serviceapi_info" long-name="Service API Info" level="app">
+     <component unofficial="yes" name="serviceproviders" origin-model="foundation">
+      <unit bldFile="mw/serviceapi/serviceproviders/group"/>
+     </component>
+     <component unofficial="yes" name="serviceapi_test" long-name="Service API Test" origin-model="foundation">
+      <!-- <unit bldFile="mw/serviceapi/tsrc/group"/> -->
+     </component>
+    </collection>
+   </block>
+   <block name="serviceapifw" long-name="Service API Framework" tech_domain="rt" level="specific" levels="plugin framework server generic specific">
+    <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
+     <component name="lifwservicehandler" long-name="Service Handler" origin-model="foundation">
+      <unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
+     </component>
+    </collection>
+    <collection name="rtsecuritymanager" long-name="RT Security Manager" level="server">
+     <component name="rtsecuritymanagerutil" long-name="RT Security Manager Util" origin-model="foundation">
+      <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
+     </component>
+     <component name="rtsecuritymanagerserver" long-name="RT Security Managers Erver" origin-model="foundation">
+      <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
+     </component>
+     <component name="rtsecuritymanagerclient" long-name="RT Security Manager Client" origin-model="foundation">
+      <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
+     </component>
+     <component unofficial="yes" name="rtsecuritymanager_build" long-name="RT Security Manager Build" origin-model="foundation">
+      <unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
+     </component>
+    </collection>
+    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
+     <component unofficial="yes" name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/serviceapifw/serviceapifw_pub/group"/>
+     </component>
+     <component unofficial="yes" name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/group"/>
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/tsrc/group"/>
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group"/>
+      <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="serviceapifw_build" long-name="Service API Framework Build" origin-model="foundation">
+      <unit bldFile="mw/serviceapifw/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="shortlinkconn" long-name="Shortlink Connectivity" tech_domain="de" level="generic" levels="framework server generic specific plugin">
+    <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
+     <component name="bteng" long-name="Bluetooth Engine" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/bteng/group"/>
+     </component>
+     <component name="btnotif" long-name="Bluetooth Notifier" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/btnotif/group"/>
+      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->
+     </component>
+     <component name="btaudioman" long-name="Bluetooth Audio Man" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudioman/group"/>
+     </component>
+     <component name="btmac" long-name="Bluetooth Mac" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/btmac/group"/>
+     </component>
+     <component name="btsac" long-name="Bluetooth SAC" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/btsac/group"/>
+     </component>
+     <component name="btaudiostreamer" long-name="Bluetooth Audio Streamer" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudiostreamer/group"/>
+      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btaudiostreamer/tsrc/btaudiostreamerapitest/group"/> -->
+     </component>
+     <component name="btsap" long-name="Bluetooth SAP" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/btsap/group"/>
+     </component>
+     <component name="btui" long-name="Bluetooth UI" origin-model="foundation">
+      <!-- <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/ecom/group"/> -->
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/btui/group"/>
+     </component>
+     <component name="btpbap" long-name="Bluetooth PBAP" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/btpbap/group"/>
+     </component>
+     <component name="bthid" long-name="BTHID" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/bthid/group"/>
+     </component>
+     <component unofficial="yes" name="bluetoothengine_build" long-name="Bluetooth Engine Build" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/bluetoothengine/group"/>
+     </component>
+    </collection>
+    <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
+     <component name="atext" long-name="Atext" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/localconnectivityservice/atext/group"/>
+     </component>
+     <component name="locod" long-name="Locod" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
+     </component>
+     <component name="obexserviceman" long-name="Obex Service Man" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
+     </component>
+     <component name="obexsendservices" long-name="Obex Send Services" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
+     </component>
+     <component name="obexreceiveservices" long-name="OBEX Receive Services" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
+     </component>
+     <component name="dun" long-name="Dun" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
+     </component>
+     <component name="lcstylustap" long-name="LC Stylus Tap" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
+     </component>
+     <component name="generichid" long-name="Generic HID" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
+     </component>
+     <component unofficial="yes" name="localconnectivityservice_build" long-name="Local Connectivity Service Build" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/localconnectivityservice/group"/>
+     </component>
+    </collection>
+    <collection name="usbclasses" long-name="USB classes" level="framework">
+     <component name="usbobexclasscontroller" long-name="USB Obex Class Controller" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbclasses/usbobexclasscontroller/group"/>
+      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/usbobexclasscontroller/tsrc/group"/> -->
+     </component>
+     <component name="usbbasicpersonality" long-name="USB Basic Personality" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbclasses/usbbasicpersonality/group"/>
+     </component>
+     <component name="usbmscpersonality" long-name="USB Msc Personality" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbclasses/usbmscpersonality/group"/>
+     </component>
+     <component name="ptpstack" long-name="Ptp Stack" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbclasses/ptpstack/group"/>
+     </component>
+     <component name="sicdusbplugin" long-name="Sicd USB Plugin" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbclasses/sicdusbplugin/group"/>
+     </component>
+     <component name="ptpserver" long-name="Ptp Server" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/group"/>
+      <!-- <unit bldFile="mw/shortlinkconn/usbclasses/ptpserver/ptpclasscontroller/group"/> -->
+     </component>
+     <component name="pictbridgeengine" long-name="Pictbridge Engine" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbclasses/pictbridgeengine/group"/>
+     </component>
+     <component name="usbosdescriptorhandler" long-name="USB Os Descriptor Handler" origin-model="foundation"/>
+    </collection>
+    <collection name="usbengines" long-name="USB Engines" level="generic">
+     <component name="usbwatcher" long-name="USB Watcher" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbengines/usbwatcher/group"/>
+     </component>
+     <component name="usblocodplugin" long-name="USB Locod Plugin" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbengines/usblocodplugin/group"/>
+      <!-- <unit bldFile="mw/shortlinkconn/usbengines/usblocodplugin/tsrc/group"/> -->
+     </component>
+     <component name="usbdevcon" long-name="USB Devcon" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbengines/usbdevcon/group"/>
+     </component>
+     <component name="usbremotepersonality" long-name="USB Remote Personality" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbengines/usbremotepersonality/group"/>
+     </component>
+    </collection>
+    <collection name="usbuis" long-name="USB UIs" level="specific">
+     <component name="usbui" long-name="USB UI" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbuis/usbui/group"/>
+      <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbui/tsrc/usbuiapitest/group"/> -->
+     </component>
+     <component name="usbuinotif" long-name="USB UI Notif" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbuis/usbuinotif/group"/>
+      <!-- <unit bldFile="mw/shortlinkconn/usbuis/usbuinotif/tsrc/usbuinotifapitest/group"/> -->
+     </component>
+     <component name="imageprintuiprovider" long-name="ImagePrint UI Provider" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbuis/imageprintuiprovider/group"/>
+     </component>
+     <component name="usbimageprintui" long-name="ImagePrint UI" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/usbuis/imageprintui/group"/>
+     </component>
+    </collection>
+    <collection name="obex" long-name="OBEX" level="generic">
+     <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/shortlinkconn/obex/obexprotocol/group" mrp="mw/shortlinkconn/obex/obexprotocol/group/obex.mrp"/>
+     </component>
+     <component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/shortlinkconn/obex/obexextensionapi/group" mrp="mw/shortlinkconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
+     </component>
+    </collection>
+    <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
+     <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
+      <unit bldFile="mw/shortlinkconn/bluetoothappprofiles/avrcp" mrp="mw/shortlinkconn/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
+     </component>
+    </collection>
+    <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
+     <component unofficial="yes" name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/group"/>
+     </component>
+     <component unofficial="yes" name="public" origin-model="foundation">
+      <!-- <unit bldFile="mw/shortlinkconn/tsrc/public/basic/group"/> -->
+     </component>
+     <component unofficial="yes" name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" class="api" origin-model="foundation">
+      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/group"/>
+     </component>
+     <component unofficial="yes" name="shortlinkconn_build" long-name="Shortlink Connectivity Build" origin-model="foundation">
+      <unit bldFile="mw/shortlinkconn/group"/>
+     </component>
+    <component name="shortlinkconn_metadata" long-name="Shortlink Connectivity Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
+      <unit mrp="mw/shortlinkconn/shortlinkconn_info/shortlinkconn_metadata/shortlinkconn_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
    <block name="svgt" long-name="SVG Tiny" tech_domain="ui" level="generic" levels="util ui">
     <collection name="svgtopt" long-name="SVGT Opt" level="util">
      <component name="svg" origin-model="foundation">
@@ -6716,342 +6801,252 @@
      </component>
     </collection>
    </block>
-   <block name="hapticsservices" long-name="Haptics Services" tech_domain="ui" level="generic" levels="fw api">
-    <collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-     <component name="tactilearearegistry" long-name="Tactile Area Registry" origin-model="foundation">
-      <unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-     </component>
-     <component name="tactilefeedbackclient" long-name="Tactile Feedback Client" origin-model="foundation">
-      <unit bldFile="mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-     </component>
-     <component name="tactileactionplugin" long-name="TactilE Action Plugin" origin-model="foundation"/>
-     <component name="tactileclickplugin" long-name="Tactile Click Plugin" origin-model="foundation"/>
-     <component name="tactilefeedbackresolver" long-name="Tactile Feedback Resolver" origin-model="foundation"/>
-     <component unofficial="yes" name="tactilefeedback_build" long-name="Tactile Feedback Build" origin-model="foundation">
-      <unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
-     </component>
-    </collection>
-    <collection name="hapticsservices_info" long-name="Haptics Services Info" level="api">
-     <component unofficial="yes" name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/hapticsservices/hapticsservices_pub/group"/>
-     </component>
-     <component unofficial="yes" name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/hapticsservices/hapticsservices_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="homescreensrv" long-name="Home Screen Services" tech_domain="ui" level="specific" levels="plugin framework server generic specific">
-    <collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-     <component name="contentpublishingutils" long-name="Content Publishing Utils" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/>
-      <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-     </component>
-     <component name="contentpublishingserver" long-name="Content Publishing Server" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-     </component>
-     <component name="contentharvester" long-name="Content Harvester" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-     </component>
-     <component unofficial="yes" name="contentpublishingsrv_build" long-name="Content Publishing Service Build" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/contentpublishingsrv/group"/>
-     </component>
-    </collection>
-    <collection name="backsteppingsrv" long-name="Backstepping Service" level="server">
-     <component name="bsengine" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
-     </component>
-    </collection>
-    <collection name="xcfw" long-name="XCFW" level="framework">
-     <component name="xcfw_build" long-name="XCFW" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/xcfw/group"/>
-     </component>
-    </collection>
-    <collection name="homescreenpluginsrv" long-name="Homescreen Plugin Service" level="plugin">
-     <component name="hspsdefinitionengine" long-name="Homescreen Plugin Server Definition Engine" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdefinitionengine/group"/>
-     </component>
-     <component name="hspsdom" long-name="Homescreen Plugin Server DOM" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsdom/group"/>
-     </component>
-     <component name="hspspluginregistry" long-name="Homescreen Plugin Registry" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspspluginregistry/group"/>
-     </component>
-     <component name="hspsmanager" long-name="Homescreen Plugin Server Manager" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsmanager/group"/>
-     </component>
-     <component name="hspsodt" long-name="Homescreen Plugin Server ODT" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsodt/group"/>
-     </component>
-     <component name="hspsresource" long-name="Homescreen Plugin Server Resource" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsresource/group"/>
-     </component>
-     <component name="hspsresult" long-name="Homescreen Plugin Server Result" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspsresult/group"/>
-     </component>
-     <component name="hspstools" long-name="Homescreen Plugin Server Tools" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/hspstools/group"/>
-     </component>
-     <component unofficial="yes" name="homescreenpluginsrv_build" long-name="Homescreen Plugin Service Build" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/homescreenpluginsrv/group"/>
-     </component>
-    </collection>
-    <collection name="idlefw" long-name="Idle Framework" level="framework">
-     <component name="idlefw_plugins" long-name="Plugins" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/idlefw/plugins/group"/>
-      <!-- <unit bldFile="mw/homescreensrv/idlefw/plugins/pslnactiveidleplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="idlefw_build" long-name="Idle Framework Build" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/idlefw/group"/>
-     </component>
-    </collection>
-    <collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-     <component name="menusatinterface" long-name="Menu SAT Interface" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-     </component>
-     <component unofficial="yes" name="menucontentsrv_build" long-name="Menu Content Service Build" origin-model="foundation">
-      <unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
-     </component>
-    </collection>
-    <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
-     <component unofficial="yes" name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/> -->
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/group"/>
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
-     </component>
-    </collection>
-   </block>
-   <block name="appinstall" long-name="Application Installation" tech_domain="rt" level="generic" levels="tool framework generic api">
-    <collection name="appinstaller" long-name="App Installer" level="generic">
-     <component name="appmngr2" long-name="App Mngr2" origin-model="foundation">
-      <unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
-     </component>
-     <component name="appinstui" long-name="App Installer UI" origin-model="foundation">
-      <unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
-     </component>
-     <component unofficial="yes" name="appinstaller_build" long-name="App Installer Build" origin-model="foundation">
-      <unit bldFile="mw/appinstall/appinstaller/group"/>
-     </component>
-    </collection>
-    <collection name="ncdengine" long-name="NCD Engine" level="framework">
-     <component name="ncdengine_engine" long-name="Engine" origin-model="foundation">
-      <unit bldFile="mw/appinstall/ncdengine/engine/group"/>
-     </component>
-     <component name="debuglogger" long-name="Debug Logger" origin-model="foundation">
-      <!-- <unit bldFile="mw/appinstall/ncdengine/debuglogger/group"/> -->
-     </component>
-     <component unofficial="yes" name="ncdengine_build" long-name="NCD Engine Build" origin-model="foundation">
-      <unit bldFile="mw/appinstall/ncdengine/group"/>
-     </component>
-    </collection>
-    <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-     <component name="iaupdateapi_stub_build" origin-model="foundation">
-      <unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
-     </component>
-    </collection>
-    <collection name="iaupdate" long-name="IA Update" level="api">
-     <component name="iad" origin-model="foundation">
-      <unit bldFile="mw/appinstall/iaupdate/iad/group"/>
-     </component>
-     <component name="iaupdate_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="mw/appinstall/iaupdate/help/group"/>
-     </component>
-     <component unofficial="yes" name="iaupdate_build" long-name="IA Update Build" origin-model="foundation">
-      <unit bldFile="mw/appinstall/iaupdate/group"/>
-     </component>
-    </collection>
-    <collection name="appinstall_info" long-name="Application Installation Info" level="api">
-     <component unofficial="yes" name="appinstall_pub" long-name="Application Installation Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/appinstall/appinstall_pub/group"/>
-      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
-      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
-     </component>
-     <component unofficial="yes" name="appinstall_test" long-name="Application Installation Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/appinstall/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="appinstall_plat" long-name="Application Installation Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
-      <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
-      <unit bldFile="mw/appinstall/appinstall_plat/group"/>
-     </component>
-    <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-     </component>
-    </collection>
-	<!-- Collection manually added due to faulty merge XSLT -->
-	<collection name="installationservices" long-name="Installation Services" level="generic">
-	 <component name="swi" long-name="Secure Software Install" purpose="optional">
-	  <unit bldFile="mw/appinstall/installationservices/swi/group" mrp="mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-	 </component>
-	 <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-	  <unit bldFile="mw/appinstall/installationservices/swidevicetools/group" mrp="mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-	 </component>
-	 <component name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
-	  <unit bldFile="mw/appinstall/installationservices/switestfw/group" mrp="mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
-	 </component>
-	 <component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-	  <unit bldFile="mw/appinstall/installationservices/swiconfig/group" mrp="mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-	 </component>
-	</collection>
-    <collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="swisistools">
-       -  <unit bldFile="mw/appinstall/secureswitools/swisistools/test/tinterpretsisinteg/tintsistef"/>  -
-      </component>-->
-    <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="mw/appinstall/secureswitools/makekeys/group" mrp="mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-     </component>
-     <component name="n:swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/> -->
-     </component>
-     <component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit mrp="mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-     </component>
-    </collection>
-   </block>
-   <block name="serviceapifw" long-name="Service API Framework" tech_domain="rt" level="specific" levels="plugin framework server generic specific">
-    <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-     <component name="lifwservicehandler" long-name="Service Handler" origin-model="foundation">
-      <unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-     </component>
-    </collection>
-    <collection name="rtsecuritymanager" long-name="RT Security Manager" level="server">
-     <component name="rtsecuritymanagerutil" long-name="RT Security Manager Util" origin-model="foundation">
-      <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-     </component>
-     <component name="rtsecuritymanagerserver" long-name="RT Security Managers Erver" origin-model="foundation">
-      <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-     </component>
-     <component name="rtsecuritymanagerclient" long-name="RT Security Manager Client" origin-model="foundation">
-      <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_build" long-name="RT Security Manager Build" origin-model="foundation">
-      <unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
-     </component>
-    </collection>
-    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
-     <component unofficial="yes" name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_pub/group"/>
-     </component>
-     <component unofficial="yes" name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/group"/>
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/tsrc/group"/>
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group"/>
-      <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="serviceapifw_build" long-name="Service API Framework Build" origin-model="foundation">
-      <unit bldFile="mw/serviceapifw/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="serviceapi" long-name="Service API" tech_domain="rt" level="specific" levels="os mw1 mw2 app">
-    <collection name="sapi_applicationmanager" long-name="SAPI Application Manager" level="mw1">
-     <component name="appmanagerservice" long-name="App Manager Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_applicationmanager_build" long-name="SAPI Application Manager Build" origin-model="foundation">
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_calendar" long-name="SAPI Calendar" level="app">
-     <component name="calendarservice" long-name="Calendar Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_calendar_build" long-name="SAPI Calendar Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group"/> -->
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_contacts_vpbk" long-name="SAPI Contacts Vpbk" level="app">
-     <component name="contactservice" long-name="Contact Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_contacts_vpbk_build" long-name="SAPI Contacts Vpbk Build" origin-model="foundation">
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_landmarks" long-name="SAPI Landmarks" level="mw2">
-     <component name="landmarksservice" long-name="Landmarks Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_landmarks_build" long-name="SAPI Landmarks Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_location" long-name="SAPI Location" level="mw2">
-     <component name="locationservice" long-name="Location Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_location_build" long-name="SAPI Location Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetloc/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/group"/> -->
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_logging" long-name="SAPI Logging" level="app">
-     <component name="loggingservice" long-name="Logging Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_logging_build" long-name="SAPI Logging Build" origin-model="foundation">
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/tsrc/dev/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_mediamanagement" long-name="SAPI Media Management" level="mw2">
-     <component name="mediamanagementservice" long-name="Media Management Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_mediamanagement_build" long-name="SAPI Media Management Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group"/> -->
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_messaging" long-name="SAPI Messaging" level="mw2">
-     <component name="messagingservice" long-name="Messaging Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_messaging_build" long-name="SAPI Messaging Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/status/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_sensor" long-name="SAPI Sensor" level="mw1">
-     <component name="sensorservice" long-name="Sensor Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_sensor_build" long-name="SAPI Sensor Build" origin-model="foundation">
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_sysinfo" long-name="SAPI Sysinfo" level="mw1">
-     <component name="sysinfoservice" long-name="Sysinfo Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_sysinfo_build" long-name="SAPI Sysinfo Build" origin-model="foundation">
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_serviceregistry" long-name="SAPI Service Registry" level="os">
-     <component name="serviceregistryprovider" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
-      <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-     </component>
-    </collection>
-    <collection name="serviceapi_info" long-name="Service API Info" level="app">
-     <component unofficial="yes" name="serviceproviders" origin-model="foundation">
-      <unit bldFile="mw/serviceapi/serviceproviders/group"/>
-     </component>
-     <component unofficial="yes" name="serviceapi_test" long-name="Service API Test" origin-model="foundation">
-      <!-- <unit bldFile="mw/serviceapi/tsrc/group"/> -->
+   <block name="uitools" long-name="UI Tools" tech_domain="to" level="specific" levels="compile encode tool">
+    <collection name="gfxtools" long-name="Graphics Tools" level="tool">
+     <component name="gditools" long-name="GDI Tools" origin-model="foundation">
+      <unit bldFile="mw/uitools/gfxtools/gditools/group"/>
+     </component>
+     <component name="color" origin-model="foundation">
+      <unit bldFile="mw/uitools/gfxtools/color/group"/>
+     </component>
+    </collection>
+    <collection name="reszip" long-name="Reszip" level="encode">
+     <component name="reszip_build" origin-model="foundation">
+      <unit bldFile="mw/uitools/reszip/group"/>
+     </component>
+    </collection>
+    <collection name="toollibraries" long-name="Tool Libraries" level="tool">
+     <component name="arabica" origin-model="foundation"/>
+     <component name="xercesc" long-name="Xerces C" origin-model="foundation"/>
+     <component unofficial="yes" name="toollibraries_build" long-name="Tool Libraries Build" origin-model="foundation">
+      <!-- <unit bldFile="mw/uitools/toollibraries/group"/> -->
+     </component>
+    </collection>
+    <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
+     <component name="svgtenc" long-name="SVGT Enc" origin-model="foundation">
+      <unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
+     </component>
+     <component unofficial="yes" name="svgtencoder_build" long-name="SVGT Encoder Build" origin-model="foundation">
+      <unit bldFile="mw/uitools/svgtencoder/group"/>
+     </component>
+    </collection>
+    <collection name="uitools_info" long-name="UI Tools Info" level="tool">
+     <component unofficial="yes" name="uitools_plat" long-name="UI Tools Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/uitools/uitools_plat/group"/>
+     </component>
+     <component unofficial="yes" name="uitools_pub" long-name="UI Tools Public Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/uitools/uitools_pub/group"/>
+     </component>
+     <component unofficial="yes" name="uitools_build" long-name="UI Tools Build" origin-model="foundation">
+      <unit bldFile="mw/uitools/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="videoutils" long-name="Video Utils" tech_domain="mm" level="specific" levels="empty eng util">
+    <collection name="dvrengine" long-name="DVR Engine" level="eng">
+     <component name="commonrecordingengine" long-name="Common Recording Engine" origin-model="foundation">
+      <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliphandler/group"/>
+      <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliprecognizer/group"/>
+      <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtputils/group"/>
+      <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/group"/>
+     </component>
+     <component name="commonrecordingengineclient" long-name="Common Recording Engine Client" origin-model="foundation">
+      <unit bldFile="mw/videoutils/dvrengine/commonrecordingengineclient/group"/>
+     </component>
+     <component unofficial="yes" name="dvrengine_build" long-name="DVR Engine Build" origin-model="foundation">
+      <unit bldFile="mw/videoutils/dvrengine/group"/>
+     </component>
+    </collection>
+    <collection name="videoconnutility" long-name="Video Conn Utility" level="util">
+     <component name="connutilpsworker" long-name="Conn Util Ps Worker" origin-model="foundation">
+      <unit bldFile="mw/videoutils/videoconnutility/connutilpsworker/group"/>
+     </component>
+     <component unofficial="yes" name="videoconnutility_build" long-name="Video Conn Utility Build" origin-model="foundation">
+      <unit bldFile="mw/videoutils/videoconnutility/group"/>
+     </component>
+    </collection>
+    <collection name="videoscheduler" long-name="Video Scheduler" level="util">
+     <component name="schedulerclient" long-name="Scheduler Client" origin-model="foundation">
+      <unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
+     </component>
+     <component name="schedulerserver" long-name="Scheduler Server" origin-model="foundation">
+      <unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
+     </component>
+     <component unofficial="yes" name="videoscheduler_build" long-name="Video Scheduler Build" origin-model="foundation">
+      <unit bldFile="mw/videoutils/videoscheduler/group"/>
+     </component>
+    </collection>
+    <collection name="videoutils_info" long-name="Video Utils Info" level="util">
+     <component unofficial="yes" name="videoutils_plat" long-name="Video Utils Platform Interfaces" class="api" origin-model="foundation">
+      <unit bldFile="mw/videoutils/videoutils_plat/group"/>
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxconnutiltestexe/group"/> -->
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestcommon/group"/> -->
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestutilmodule/group"/> -->
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="videoutils_build" long-name="Video Utils Build" origin-model="foundation">
+      <unit bldFile="mw/videoutils/group"/>
+     </component>
+    </collection>
+   </block>
+   <block name="vpnclient" long-name="VPN Client" tech_domain="dc" level="specific" levels="engine ui api">
+    <collection name="vpnclient_sis" long-name="VPN Client Sis" level="api">
+     <component name="ce_sis" long-name="CE SIS" origin-model="foundation">
+      <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/ce_sis/group"/> -->
+     </component>
+     <component name="stub_sis" long-name="Stub Sis" origin-model="foundation">
+      <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/stub_sis/group"/> -->
+     </component>
+     <component unofficial="yes" name="vpnclient_sis_build" origin-model="foundation">
+      <!-- <unit bldFile="mw/vpnclient/vpnclient_sis/group"/> -->
+     </component>
+    </collection>
+    <collection name="vpnengine" long-name="VPN Engine" level="engine">
+     <component name="eventmediatorapi" long-name="Event Mediator API" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
+     </component>
+     <component name="eventviewer" long-name="Event Viewer" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
+     </component>
+     <component name="vpnins" long-name="VPN Ins" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
+     </component>
+     <component name="acuagenttransport" long-name="ACU Agent Transport" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/acuagenttransport/group"/>
+     </component>
+     <component name="acupluginlib" long-name="ACU Plugin Lib" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/acupluginlib/group"/>
+     </component>
+     <component name="ikepolparser" long-name="IKE Policy Parser" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
+     </component>
+     <component name="utlbase64" long-name="UTL Base64" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
+     </component>
+     <component name="utlcrypto" long-name="UTL Crypto" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
+     </component>
+     <component name="utlxml" long-name="UTL XML" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
+     </component>
+     <component name="utlpkcs10" long-name="UTL PKCS10" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
+     </component>
+     <component name="pkiserviceapi" long-name="PKI Service API" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
+     </component>
+     <component name="acuagentcrypto" long-name="ACU Agent Crypto" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/acuagentcrypto/group"/>
+     </component>
+     <component name="vpnextapi" long-name="VPN Ext. API" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/vpnextapi/group"/>
+     </component>
+     <component name="ikecert" long-name="Ike Cert" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
+     </component>
+     <component name="kmdapi" long-name="KMD API" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
+     </component>
+     <component name="kmdserver" long-name="Kmd Server" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
+     </component>
+     <component name="ikeutils" long-name="IKE Utils" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
+     </component>
+     <component name="ikev1lib" long-name="Ikev1 Library" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
+     </component>
+     <component name="ikev2lib" long-name="Ikev2 Library" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
+     </component>
+     <component name="acuagentmessage" long-name="ACU Agent Message" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/acuagentmessage/group"/>
+     </component>
+     <component name="acuagent" long-name="ACU Agent" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/acuagent/group"/>
+     </component>
+     <component name="vpnawapi" long-name="VPN AW API" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/vpnawapi/group"/>
+     </component>
+     <component name="vpnipsecpolparser" long-name="VPN Ipsecpolparser" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
+     </component>
+     <component name="sit" long-name="Sit" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
+     </component>
+     <component name="acuins" long-name="ACU INS" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/acuins/group"/>
+     </component>
+     <component name="vpntcwrapper" long-name="VP NTC Wrapper" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
+     </component>
+     <component name="eventmediator" long-name="Event Mediator" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
+     </component>
+     <component name="ipsecacuplugin" long-name="IPseca Cu Plugin" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/ipsecacuplugin/group"/>
+     </component>
+     <component name="pkiservice" long-name="PKI Service" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
+     </component>
+     <component name="vpnconnagt" long-name="VPN Connagt" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
+     </component>
+     <component name="vpnmanager" long-name="VPN Manager" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
+     </component>
+     <component name="vpncleaner" long-name="VPN Cleaner" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
+     </component>
+     <component name="utlpkcs12" long-name="UTL PKCS12" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
+     </component>
+     <component name="dmadengine" long-name="DM Adapter Engine" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
+     </component>
+     <component name="dmadipsecvpn" long-name="DM Adapter IPsec VPN" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
+     </component>
+     <component name="dmadpki" long-name="DM Adapter PKI" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
+     </component>
+     <component name="ikesocketplugin" long-name="IKE Socket Plugin" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnengine/ikesocketplugin/group"/>
+     </component>
+     <component name="vpnnif" long-name="VPN NIF" origin-model="foundation"/>
+    </collection>
+    <collection name="vpnui" long-name="VPN UI" level="ui">
+     <component name="vpnecomnotifier" long-name="VPN ECOM Notifier" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
+     </component>
+     <component name="vpndialogmanager" long-name="VPN Dialog Manager" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
+     </component>
+     <component name="vpnmanagementui" long-name="VPN Management UI" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnui/vpnmanagementui/group"/>
+     </component>
+     <component name="vpnpolins" long-name="VPN Policy Ins" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
+     </component>
+     <component name="vpnpolicyrecognizer" long-name="VPN Policy Recognizer" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
+     </component>
+    </collection>
+    <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
+     <component name="vpnapi" long-name="VPN API" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
+     </component>
+    </collection>
+    <collection name="vpnclient_info" long-name="VPN Client Info" level="api">
+     <component unofficial="yes" name="vpnclient_help" long-name="VPN Client Help" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/help/group"/>
+     </component>
+     <component unofficial="yes" name="vpnclient_build" long-name="VPN Client Build" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/group"/>
+     </component>
+     <component unofficial="yes" name="vpnc_plat" class="api" origin-model="foundation">
+      <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
      </component>
     </collection>
    </block>
@@ -7346,6 +7341,52 @@
      </component>
     </collection>
    </block>
+   <block name="wirelessacc" long-name="Wireless Access" tech_domain="dc" level="specific" levels="framework generic ui">
+    <collection name="hotspotfw" long-name="Hotspot Framework" level="framework">
+     <component name="hsserver" long-name="HotSpot Server" origin-model="foundation"/>
+     <component name="hsclient" long-name="HS Client" origin-model="foundation"/>
+     <component name="internetconnectivitytestservice" long-name="Internet Connectivity Test Service" origin-model="foundation">
+      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/internetconnectivitytestservice/group"/> -->
+     </component>
+     <component name="ictsdialogs" long-name="ICTS Dialogs" origin-model="foundation">
+      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/ictsdialogs/group"/> -->
+     </component>
+     <component name="hspluginforagent" long-name="HotSpot Plugin For Agent" origin-model="foundation">
+      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hspluginforagent/group"/> -->
+     </component>
+     <component name="hsbrowser" long-name="HotSpot Browser" origin-model="foundation">
+      <!-- <unit bldFile="mw/wirelessacc/hotspotfw/hsbrowser/group"/> -->
+     </component>
+     <component unofficial="yes" name="hotspotfw_build" long-name="Hotspot Framework Build" origin-model="foundation">
+      <unit bldFile="mw/wirelessacc/hotspotfw/group"/>
+     </component>
+    </collection>
+    <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
+     <component name="wlanplugin" long-name="WLAN Plugin" origin-model="foundation">
+      <unit bldFile="mw/wirelessacc/wlanutilities/wlanplugin/group"/>
+     </component>
+     <component name="wlansettingsui" long-name="WLAN Settings UI" origin-model="foundation">
+      <unit bldFile="mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
+     </component>
+     <component name="wlansniffer" long-name="WLAN Sniffer" origin-model="foundation">
+      <unit bldFile="mw/wirelessacc/wlanutilities/wlansniffer/group"/>
+     </component>
+     <component name="wlanindicatorplugin" long-name="WLAN Indicator Plugin" origin-model="foundation">
+      <unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
+     </component>
+     <component unofficial="yes" name="wlanutilities_build" long-name="WLAN Utilities Build" origin-model="foundation">
+      <unit bldFile="mw/wirelessacc/wlanutilities/group"/>
+     </component>
+    </collection>
+    <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
+     <component unofficial="yes" name="hsfw_plat" class="api" origin-model="foundation">
+      <unit bldFile="mw/wirelessacc/hsfw_plat/group"/>
+     </component>
+     <component unofficial="yes" name="wirelessacc_build" long-name="Wireless Access Build" origin-model="foundation">
+      <unit bldFile="mw/wirelessacc/group"/>
+     </component>
+    </collection>
+   </block>
    <block name="conntools" long-name="Conn Tools" tech_domain="to" level="generic" levels="1 2">
     <collection name="nettools" long-name="Net Tools" level="2">
      <component name="conntest" long-name="Connection Test" origin-model="foundation">
@@ -7381,47 +7422,6 @@
      </component>
     </collection>
    </block>
-   <block name="uitools" long-name="UI Tools" tech_domain="to" level="specific" levels="compile encode tool">
-    <collection name="gfxtools" long-name="Graphics Tools" level="tool">
-     <component name="gditools" long-name="GDI Tools" origin-model="foundation">
-      <unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-     </component>
-     <component name="color" origin-model="foundation">
-      <unit bldFile="mw/uitools/gfxtools/color/group"/>
-     </component>
-    </collection>
-    <collection name="reszip" long-name="Reszip" level="encode">
-     <component name="reszip_build" origin-model="foundation">
-      <unit bldFile="mw/uitools/reszip/group"/>
-     </component>
-    </collection>
-    <collection name="toollibraries" long-name="Tool Libraries" level="tool">
-     <component name="arabica" origin-model="foundation"/>
-     <component name="xercesc" long-name="Xerces C" origin-model="foundation"/>
-     <component unofficial="yes" name="toollibraries_build" long-name="Tool Libraries Build" origin-model="foundation">
-      <!-- <unit bldFile="mw/uitools/toollibraries/group"/> -->
-     </component>
-    </collection>
-    <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-     <component name="svgtenc" long-name="SVGT Enc" origin-model="foundation">
-      <unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-     </component>
-     <component unofficial="yes" name="svgtencoder_build" long-name="SVGT Encoder Build" origin-model="foundation">
-      <unit bldFile="mw/uitools/svgtencoder/group"/>
-     </component>
-    </collection>
-    <collection name="uitools_info" long-name="UI Tools Info" level="tool">
-     <component unofficial="yes" name="uitools_plat" long-name="UI Tools Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/uitools/uitools_plat/group"/>
-     </component>
-     <component unofficial="yes" name="uitools_pub" long-name="UI Tools Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="mw/uitools/uitools_pub/group"/>
-     </component>
-     <component unofficial="yes" name="uitools_build" long-name="UI Tools Build" origin-model="foundation">
-      <unit bldFile="mw/uitools/group"/>
-     </component>
-    </collection>
-   </block>
   </layer>
   <layer name="os" long-name="OS" levels="hw services">
    <block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 4">