--- a/symbian4/single/sysdefs/system_model.xml	Wed Jun 30 17:01:33 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Wed Jun 30 17:04:40 2010 +0100
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE SystemDefinition [
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
 <!ELEMENT SystemDefinition ( systemModel )>
 <!ATTLIST SystemDefinition
   name CDATA #REQUIRED
@@ -72,7 +73,7 @@
   priority CDATA #IMPLIED
 >
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" span="2" long-name="Stubs" levels="adaptation plugin mid engine">
@@ -873,6 +874,9 @@
 <component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
 <unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
 </component>
+<component name="autoaudio_plugin_api" long-name="Auto Audio Plugin API" filter="s60" introduced="^4" class="api">
+<unit bldFile="os/devicesrv/devicesrv_plat/autoaudio_plugin_api/group"/>
+</component>
 </collection>
 <collection name="accessoryservices" long-name="Accessory Services" level="framework">
 <component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
@@ -893,12 +897,15 @@
 <component name="tspclientmapper" filter="s60" long-name="TSP Client Mapper">
 <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
 </component>
-<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
+<component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional" filter="s60">
 <unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
 </component>
 <component name="gid_pc_tool" filter="s60" long-name="Generic ID PC Tool" class="tool PC">
 <unit bldFile="os/devicesrv/accessoryservices/gid_pc_tool/group"/>
 </component>
+<component name="autoaudioasy" filter="s60" long-name="Auto Audio Plugin" introduced="^4" plugin="Y">
+<unit bldFile="os/devicesrv/accessoryservices/autoaudioasy/group"/>
+</component>
 </collection>
 <collection name="commonservices" long-name="Common Services" level="app-if">
 <component name="commonengine" filter="s60" long-name="Common Engine">
@@ -910,10 +917,10 @@
 <component name="platformenv" filter="s60" long-name="Platform Environment">
 <unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
 </component>
-<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5">
+<component name="sysutil" long-name="System Utilities" purpose="mandatory" introduced="ER5" filter="s60">
 <unit bldFile="os/devicesrv/commonservices/sysutil/group" mrp="os/devicesrv/commonservices/sysutil/group/sysutil.mrp"/>
 </component>
-<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5">
+<component name="activitymanager" long-name="Activity Manager" purpose="mandatory" introduced="ER5" filter="s60">
 <unit bldFile="os/devicesrv/commonservices/activitymanager/group" mrp="os/devicesrv/commonservices/activitymanager/group/activitymanager.mrp"/>
 </component>
 </collection>
@@ -984,10 +991,10 @@
 <component name="vibractrl" filter="s60" long-name="Vibra Control" deprecated="9.1">
 <unit bldFile="os/devicesrv/resourcemgmt/vibractrl/group"/>
 </component>
-<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional">
+<component name="hwresourcesmgr" long-name="Hardware Resources Manager" introduced="^2" purpose="optional" filter="s60">
 <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/group" mrp="os/devicesrv/resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
 </component>
-<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
+<component name="hwresourcesmgrconfig" long-name="Hardware Resources Manager Config" introduced="^3" purpose="optional" filter="s60" class="config">
 <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
 <component name="resourcemgmt_data" filter="s60" long-name="Resource Management Data" class="config">
@@ -1023,16 +1030,16 @@
 <component name="sysuiprovider" filter="s60" long-name="System UI Provider" introduced="^3">
 <unit bldFile="os/devicesrv/sysstatemgmt/sysuiprovider/group"/>
 </component>
-<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
+<component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory" filter="s60">
 <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/group" mrp="os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
 </component>
-<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory">
+<component name="systemstatemgr" long-name="System State Manager" introduced="^3" purpose="mandatory" filter="s60">
 <unit bldFile="os/devicesrv/sysstatemgmt/systemstatemgr/group" mrp="os/devicesrv/sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
 </component>
-<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" plugin="Y">
+<component name="systemstateplugins" long-name="System State Plugins" introduced="^3" purpose="optional" filter="s60" plugin="Y">
 <unit bldFile="os/devicesrv/sysstatemgmt/systemstateplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstateplugins/group/app-framework_ssplugins.mrp"/>
 </component>
-<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" plugin="Y">
+<component name="systemstatereferenceplugins" long-name="System State Reference Plugins" introduced="^3" purpose="optional" filter="s60" plugin="Y">
 <unit bldFile="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group" mrp="os/devicesrv/sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
 </component>
 </collection>
@@ -1042,7 +1049,7 @@
 </component>
 </collection>
 <collection name="systemhealthmanagement" long-name="System Health Management" level="server">
-<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional">
+<component name="systemhealthmgr" long-name="System Health Manager" introduced="^3" purpose="optional" filter="s60">
 <unit bldFile="os/devicesrv/systemhealthmanagement/systemhealthmgr/group" mrp="os/devicesrv/systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
 </component>
 </collection>
@@ -1196,21 +1203,23 @@
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
+<component name="networkpmutils" long-name="Network Protocol Module Utilities" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/networkpmutils/group" mrp="os/lbs/networkprotocolmodules/networkpmutils/group/lbs_networkpmutils.mrp"/>
+</component>
+<component name="suplpmcore" long-name="SUPL Protocol Module Core" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/suplpmcore/group" mrp="os/lbs/networkprotocolmodules/suplpmcore/group/lbs_suplpmcore.mrp"/>
+</component>
+<component name="networkpmasn1_pub" long-name="Network Protocol Module ASN1 Public Interfaces" introduced="^3" purpose="optional" class="api">
+<unit bldFile="os/lbs/networkprotocolmodules/networkpmasn1_pub/group" mrp="os/lbs/networkprotocolmodules/networkpmasn1_pub/group/lbs_networkpmasn1_pub.mrp"/>
+</component>
+<component name="suplcontrolplaneprotocols" long-name="SUPL Control Plane Protocols" introduced="^3" purpose="optional" plugin="Y">
+<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/group" mrp="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/group/lbs_suplcontrolplaneprotocols.mrp"/>
+</component>
 <component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+<unit bldFile="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
 </component>
 <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
-</component>
-<component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
-</component>
-<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
-<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-<unit bldFile="os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+<unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
@@ -1501,12 +1510,6 @@
 <unit bldFile="os/wlan/wlan_bearer/wlannwif/group"/>
 </component>
 </collection>
-<collection name="wlanapitest" long-name="WLAN API Tests" level="test"/>
-<collection name="wlan_info" long-name="WLAN Info" level="test">
-<component name="wlan_metadata" long-name="WLAN Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-</component>
-</collection>
 </block>
 <block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
@@ -1612,6 +1615,11 @@
 </component>
 </collection>
 <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
+<collection name="wapstack" long-name="WAP Stack" level="plugin">
+<component name="wapmessageapi" long-name="WAP Message API" purpose="optional">
+<unit bldFile="os/cellularsrv/wapstack/wapmessageapi/group" mrp="os/cellularsrv/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/>
+</component>
+</collection>
 </block>
 <block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
 <collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
@@ -1697,6 +1705,9 @@
 </collection>
 </block>
 <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+<collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
+<!-- placeholder for platform APIs -->
+</collection>
 <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
 <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
 </collection>
@@ -1717,13 +1728,13 @@
 <block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
 <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
 <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
+<unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
 </component>
 <component name="audio_effects_presets_api" long-name="Audio Effects Presets API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group"/>
+<unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group" filter="!test"/>
 </component>
 <component name="drm_audio_player_api" long-name="DRM Audio Player API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_pub/drm_audio_player_api/group"/>
+<unit bldFile="os/mm/mm_pub/drm_audio_player_api/group" filter="!test"/>
 </component>
 <component name="multimedia_extension_interfaces_api" long-name="Multimedia Extension Interfaces API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
@@ -1731,7 +1742,7 @@
 </collection>
 <collection name="mm_plat" long-name="Multimedia Platform Interfaces" level="app-if">
 <component name="aac_decoder_config_api" long-name="AAC Decoder Config API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group"/>
+<unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group" filter="!test"/>
 </component>
 <component name="aac_decoder_config_msg_hdlr_api" long-name="AAC Decoder Config Msg Hdlr API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
@@ -1758,7 +1769,7 @@
 <unit bldFile="os/mm/mm_plat/audio_policy_header_api/group"/>
 </component>
 <component name="audio_routing_api" long-name="Audio Routing API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/audio_routing_api/group"/>
+<unit bldFile="os/mm/mm_plat/audio_routing_api/group" filter="!test"/>
 </component>
 <component name="audio_routing_msg_hdlr_api" long-name="Audio Routing Msg Hdlr API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
@@ -1785,7 +1796,7 @@
 <unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
 </component>
 <component name="eaac_plus_decoder_interface_api" long-name="eAAC Plus Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group" filter="!test"/>
 </component>
 <component name="eaac_plus_decoder_interface_msg_hdlr_api" long-name="eAAC Plus Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
@@ -1794,7 +1805,7 @@
 <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
 </component>
 <component name="error_concealment_interface_api" long-name="Error Concealment Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group" filter="!test"/>
 </component>
 <component name="error_concealment_interface_msg_hdlr_api" long-name="Error Concealment Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
@@ -1806,7 +1817,7 @@
 <unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
 </component>
 <component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group" filter="!test"/>
 </component>
 <component name="g711_decoder_interface_msg_hdlr_api" long-name="G711 Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
@@ -1815,7 +1826,7 @@
 <unit bldFile="os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
 </component>
 <component name="g711_encoder_interface_api" long-name="G711 Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group" filter="!test"/>
 </component>
 <component name="g711_encoder_interface_msg_hdlr_api" long-name="G711 Encoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
@@ -1824,7 +1835,7 @@
 <unit bldFile="os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
 </component>
 <component name="g729_decoder_interface_api" long-name="G729 Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group" filter="!test"/>
 </component>
 <component name="g729_decoder_interface_msg_hdlr_api" long-name="G729 Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
@@ -1833,7 +1844,7 @@
 <unit bldFile="os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
 </component>
 <component name="g729_encoder_interface_api" long-name="G729 Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group" filter="!test"/>
 </component>
 <component name="g729_encoder_interface_proxy_api" long-name="G729 Encoder Interface Proxy API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
@@ -1842,13 +1853,13 @@
 <unit bldFile="os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
 </component>
 <component name="global_audio_settings_api" long-name="Global Audio Settings API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/global_audio_settings_api/group"/>
+<unit bldFile="os/mm/mm_plat/global_audio_settings_api/group" filter="!test"/>
 </component>
 <component name="global_audio_settings_definition_api" long-name="Global Audio Settings Definition API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/global_audio_settings_definition_api/group"/>
 </component>
 <component name="ilbc_decoder_interface_api" long-name="Ilbc Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group" filter="!test"/>
 </component>
 <component name="ilbc_decoder_interface_msg_hdlr_api" long-name="Ilbc Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
@@ -1857,7 +1868,7 @@
 <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
 </component>
 <component name="ilbc_encoder_interface_api" long-name="Ilbc Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group" filter="!test"/>
 </component>
 <component name="ilbc_encoder_interface_msg_hdlr_api" long-name="Ilbc Encoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
@@ -1878,7 +1889,7 @@
 <unit bldFile="os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
 </component>
 <component name="ra8_decoder_interface_api" long-name="RA8 Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group" filter="!test"/>
 </component>
 <component name="ra8_decoder_interface_msg_hdlr_api" long-name="RA8 Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
@@ -1890,7 +1901,7 @@
 <unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
 </component>
 <component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group"/>
+<unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group" filter="!test"/>
 </component>
 <component name="restricted_audio_output_msg_hdlr_api" long-name="Restricted Audio Output Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
@@ -1899,7 +1910,7 @@
 <unit bldFile="os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
 </component>
 <component name="sbc_encoder_interface_api" long-name="SBC Encoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group" filter="!test"/>
 </component>
 <component name="sbc_encoder_interface_msg_hdlr_api" long-name="SBC Encoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
@@ -1911,7 +1922,7 @@
 <unit bldFile="os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
 </component>
 <component name="speech_encoder_config_api" long-name="Speech Encoder Config API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group"/>
+<unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group" filter="!test"/>
 </component>
 <component name="speech_encoder_config_msg_hdlr_api" long-name="Speech Encoder Config Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
@@ -1941,7 +1952,7 @@
 <unit bldFile="os/mm/mm_plat/video_window_control_custom_interface/group"/>
 </component>
 <component name="wma_decoder_interface_api" long-name="WMA Decoder Interface API" filter="s60" class="api">
-<unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group"/>
+<unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group" filter="!test"/>
 </component>
 <component name="wma_decoder_interface_msg_hdlr_api" long-name="WMA Decoder Interface Message Handler API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
@@ -2288,7 +2299,7 @@
 </component>
 </collection>
 <collection name="egl" long-name="EGL" level="internal-adaptations">
-<component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="optional">
+<component name="eglinterface" long-name="EGL Interface" introduced="^2" purpose="mandatory">
 <unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
 </component>
 <component name="eglswitch" long-name="EGL Switch" introduced="^3" purpose="optional">
@@ -2333,22 +2344,17 @@
 <collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
 </block>
 <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
-<collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-<component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-</component>
-<component name="sortutil_api" long-name="Sort Util API" filter="s60" class="api">
-<unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
-</component>
-</collection>
 <collection name="charconvfw" long-name="Character Conversion" level="encoding">
-<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
+<component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional" filter="api_test">
+<!-- both production and api_test-->
 <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
 </component>
-<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y">
+<component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" filter="apit_test" plugin="Y">
+<!-- both production and api_test-->
 <unit bldFile="os/textandloc/charconvfw/charconvplugins/group" mrp="os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
 </component>
-<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y">
+<component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" filter="api_test" plugin="Y">
+<!-- both production and api_test-->
 <unit bldFile="os/textandloc/charconvfw/fatfilenameconversionplugins/group" mrp="os/textandloc/charconvfw/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
 </component>
 </collection>
@@ -2356,7 +2362,8 @@
 <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" deprecated="^4" plugin="Y">
 <unit bldFile="os/textandloc/fontservices/textshaperplugin/group" mrp="os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
 </component>
-<component name="fontstore" long-name="Font Store" purpose="mandatory">
+<component name="fontstore" long-name="Font Store" purpose="mandatory" filter="api_test">
+<!-- both production and api_test-->
 <unit bldFile="os/textandloc/fontservices/fontstore/group" mrp="os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
 </component>
 <component name="textbase" long-name="Text Base" purpose="mandatory" class="placeholder">
@@ -2418,20 +2425,14 @@
 </block>
 <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
 <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-<component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
-	  Remove this component and uncomment the other units when fixed-->
-<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-</component>
-<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
-</component>
-<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
-</component>
-<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api placeholder">
-<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+<component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api">
+<unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/group"/>
+</component>
+<component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api">
+<unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/group"/>
+</component>
+<component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api">
+<unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/group"/>
 </component>
 </collection>
 <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
@@ -2502,7 +2503,7 @@
 <component name="system_model" long-name="System Model" introduced="^2" purpose="development" class="config PC">
 <unit mrp="os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
 </component>
-<component name="sf_config" filter="s60" long-name="Foundation Config" introduced="^4">
+<component name="sf_config" filter="s60,build_as_app" long-name="Foundation Config" introduced="^4">
 <unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
 </component>
 <component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
@@ -2815,6 +2816,9 @@
 <component name="atcmdplugin" long-name="AT Command Plugin" filter="s60,!oem_build" plugin="Y">
 <unit bldFile="mw/appsupport/coreapplicationuis/atcmdplugin/group"/>
 </component>
+<component name="devicepowermenuplugin" long-name="Device Power Menu Plugin" introduced="^4" plugin="Y">
+<unit bldFile="mw/appsupport/coreapplicationuis/devicepowermenuplugin" proFile="devicepowermenuplugin.pro"/>
+</component>
 </collection>
 <collection name="flashliteapi_3_1" long-name="Flash Lite API 3.1" level="specific">
 <!--  collection is really a component. Move down a directory -->
@@ -3049,7 +3053,7 @@
 <unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
 </component>
 <component name="autolock" long-name="Autolock" filter="s60">
-<unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
+<unit bldFile="mw/securitysrv/securitydialogs/autolock" proFile="autolock.pro"/>
 </component>
 <component name="secui" filter="s60" long-name="Security UI">
 <unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
@@ -3067,17 +3071,8 @@
 <component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
 <unit bldFile="mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
 </component>
-<component name="indicatorautolockplugin" long-name="Auto Lock Indicator Plugin" introduced="^4" filter="s60" plugin="Y">
-<!-- directory at the wrong level to be a component-->
-<unit bldFile="mw/securitysrv/securitydialogs/AutolockSrv/indicatorplugin" proFile="indicatorautolockplugin.pro" qmakeArgs="-r"/>
-</component>
 <component name="autolockuseractivityservice" long-name="Auto Lock User Activity Service" introduced="^4" filter="s60">
-<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
-<unit bldFile="mw/securitysrv/securitydialogs/AutolockSrv" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
-</component>
-<component name="autolocksrv" long-name="Auto Lock Server" introduced="^4" filter="s60">
-<!-- directory at the wrong level to be a component-->
-<unit bldFile="mw/securitysrv/securitydialogs/AutolockSrv" proFile="AutolockSrv.pro" qmakeArgs="-r"/>
+<unit bldFile="mw/securitysrv/securitydialogs/Autolock/autolockuseractivityservice" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="cpsecplugins" long-name="Security Settings Plugins" level="plugin">
@@ -3200,8 +3195,8 @@
 </collection>
 <collection name="commondrm" long-name="Common DRM" level="generic">
 <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-<component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
-<!-- this should have its own bld.inf or be removed as a component -->
+<component name="drmqtencryptor" filter="s60" long-name="DRM Qt Encryptor" introduced="^4">
+<unit bldFile="mw/drm/commondrm/drmqtencryptor" proFile="qt_drmencryptor.pro" qmakeArgs="-r"/>
 </component>
 <component name="drmrightsmanagerui" filter="s60" long-name="DRM Rights Manager UI">
 <unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
@@ -3320,7 +3315,7 @@
 <component name="locationsysui" filter="s60" long-name="Location System UI">
 <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
 </component>
-<component name="locationsysui" filter="s60" long-name="Location System Qt UI">
+<component name="qtlocationsysui" filter="s60" long-name="Location System Qt UI">
 <unit bldFile="mw/locationsrv/locationsystemui/locationsysui" proFile="locsysui.pro"/>
 </component>
 </collection>
@@ -3391,7 +3386,7 @@
 </collection>
 <collection name="eapol" long-name="EAPOL" level="framework">
 <component name="eapol_framework" filter="s60" long-name="EAPOL Framework" introduced="9.2">
-<unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
+<unit bldFile="mw/accesssec/eapol/group"/>
 </component>
 </collection>
 </block>
@@ -3421,9 +3416,6 @@
 <component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
 <unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
 </component>
-<component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
-<unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
-</component>
 <component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
 <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
 </component>
@@ -3433,6 +3425,9 @@
 <component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
 <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
 </component>
+<component name="flextimer_api" long-name="Flex Timer API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/ipconnmgmt/ipcm_plat/flextimer_api/group"/>
+</component>
 </collection>
 <collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="api">
 <component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
@@ -3507,6 +3502,11 @@
 <unit bldFile="mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
 </component>
 </collection>
+<collection name="keepalive" long-name="Keep Alive" level="server">
+<component name="flextimer" filter="s60" long-name="Flex Timer" introduced="^4">
+<unit bldFile="mw/ipconnmgmt/keepalive/flextimer/group"/>
+</component>
+</collection>
 <collection name="dbcreator" long-name="DB Creator" level="utils">
 <component name="commsdatcreator" filter="s60" long-name="Comms Database Creator" introduced="9.3">
 <unit bldFile="mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
@@ -3722,19 +3722,22 @@
 <unit bldFile="mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
 </component>
 <component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
+<!--<unit bldFile="wlanutilities/wlanplugin" qt:proFile="wlanqtutilities.pro"/>-->
+</component>
+<component name="wlanwizard " filter="s60" long-name="WLAN Wizard" introduced="^4" class="placeholder">
+<!--<unit bldFile="wlanutilities/wlanwizard" qt:proFile="wlanwizard.pro"/>-->
 </component>
 <component name="wlansniffer" filter="s60" long-name="WLAN Sniffer" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
+<!--<unit bldFile="wlanutilities/wlansettingsui" qt:proFile="wlansniffer.pro"/>-->
 </component>
 <component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
+<!--<unit bldFile="wlanutilities/wlansniffer" qt:proFile="wlanentryplugin.pro"/>-->
 </component>
 <component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
+<!--<unit bldFile="wlanutilities/wlanindicatorplugin" qt:proFile="wlanindicatorplugin.pro"/>-->
 </component>
 <component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y" class="placeholder">
-<!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
+<!--<unit bldFile="wlanutilities/cpwlansettingsplugin" qt:proFile="cpwlansettingsplugin.pro"/>-->
 </component>
 </collection>
 </block>
@@ -3744,123 +3747,11 @@
 <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
 </component>
 </collection>
-<collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-<component name="vpnapi_impl" filter="s60" long-name="VPN API">
+<collection name="vpnapiimpl" long-name="VPN API Implementation" level="engine">
+<component name="vpnapi_impl" filter="s60" long-name="VPN Implementation">
 <unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
 </component>
 </collection>
-<collection name="vpnengine" long-name="VPN Engine" level="engine">
-<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
-    		or maybe split the collection into more reasonable groups  -->
-<component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-</component>
-<component name="eventviewer" filter="s60" long-name="Event Viewer">
-<unit bldFile="mw/vpnclient/vpnengine/eventviewer/group"/>
-</component>
-<component name="vpnins" filter="s60" long-name="VPN Installer">
-<unit bldFile="mw/vpnclient/vpnengine/vpnins/group"/>
-</component>
-<component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/ikepolparser/group"/>
-</component>
-<component name="utlbase64" filter="s60" long-name="Base64 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlbase64/group"/>
-</component>
-<component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlcrypto/group"/>
-</component>
-<component name="utlxml" filter="s60" long-name="XML Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlxml/group"/>
-</component>
-<component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs10/group"/>
-</component>
-<component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
-<unit bldFile="mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-</component>
-<component name="ikecert" filter="s60" long-name="IKE Certificate Management">
-<unit bldFile="mw/vpnclient/vpnengine/ikecert/group"/>
-</component>
-<component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
-<unit bldFile="mw/vpnclient/vpnengine/kmdapi/group"/>
-</component>
-<component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
-<unit bldFile="mw/vpnclient/vpnengine/kmdserver/group"/>
-</component>
-<component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
-<unit bldFile="mw/vpnclient/vpnengine/ikeutils/group"/>
-</component>
-<component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev1lib/group"/>
-</component>
-<component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
-<unit bldFile="mw/vpnclient/vpnengine/ikev2lib/group"/>
-</component>
-<component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
-<unit bldFile="mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-</component>
-<component name="sit" filter="s60" long-name="Socket Interaction Thread">
-<unit bldFile="mw/vpnclient/vpnengine/sit/group"/>
-</component>
-<component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
-<unit bldFile="mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-</component>
-<component name="eventmediator" filter="s60" long-name="Event Mediator">
-<unit bldFile="mw/vpnclient/vpnengine/eventmediator/group"/>
-</component>
-<component name="pkiservice" filter="s60" long-name="PKI Service">
-<unit bldFile="mw/vpnclient/vpnengine/pkiservice/group"/>
-</component>
-<component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
-<unit bldFile="mw/vpnclient/vpnengine/vpnconnagt/group"/>
-</component>
-<component name="vpnmanager" filter="s60" long-name="VPN Manager">
-<unit bldFile="mw/vpnclient/vpnengine/vpnmanager/group"/>
-</component>
-<component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
-<unit bldFile="mw/vpnclient/vpnengine/vpncleaner/group"/>
-</component>
-<component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
-<unit bldFile="mw/vpnclient/vpnengine/utlpkcs12/group"/>
-</component>
-<component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
-<unit bldFile="mw/vpnclient/vpnengine/dmadengine/group"/>
-</component>
-<component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-</component>
-<component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnengine/dmadpki/group"/>
-</component>
-<component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
-<unit bldFile="mw/vpnclient/vpnengine/ikesocket/group"/>
-</component>
-</collection>
-<collection name="vpnui" long-name="VPN UI" level="ui">
-<component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-</component>
-<component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
-<unit bldFile="mw/vpnclient/vpnui/vpndialogmanager/group"/>
-</component>
-<component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolins/group"/>
-</component>
-<component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
-<unit bldFile="mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-</component>
-</collection>
-<collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-<component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
-<unit bldFile="mw/vpnclient/help/group"/>
-</component>
-<component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
-<!-- should split this up into the other components and remove this-->
-<unit bldFile="mw/vpnclient/group"/>
-</component>
-</collection>
 </block>
 <block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
 <collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
@@ -3920,12 +3811,9 @@
 <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
 <unit mrp="mw/ipappsrv/group"/>
 </component>
-<component name="ipappsrv_metadata" long-name="IP App Services Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="mw/ipappsrv/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
-</component>
 </collection>
 </block>
-<block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
+<block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="utils framework server ui specific">
 <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
 <component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
 <unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
@@ -4045,23 +3933,113 @@
 <unit bldFile="mw/phonesrv/phonesrv_plat/dialpad_api/group"/>
 </component>
 </collection>
+<collection name="telutils" long-name="Telephony Utils" level="utils">
+<component name="phoneparser" filter="s60" long-name="Phone Parser">
+<unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
+</component>
+<component name="telephonyservice" filter="s60" long-name="Telephony Service">
+<unit bldFile="mw/phonesrv/telutils/telephonyservice/group"/>
+</component>
+<component name="xqtelephonyservice" filter="s60" long-name="X Qt Telephony Service" introduced="^4">
+<unit bldFile="mw/phonesrv/telutils/xqtelephonyservice" proFile="xqtelephonyservice.pro"/>
+</component>
+<component name="dialpad" filter="s60" long-name="Dial Pad" introduced="^4">
+<unit bldFile="mw/phonesrv/telutils/dialpad" proFile="dialpad.pro"/>
+</component>
+<component name="keysequencerecognitionservice" filter="s60" long-name="Key Sequence Recognition Service" introduced="^4">
+<unit bldFile="mw/phonesrv/telutils/keysequencerecognitionservice" proFile="keysequencerecognitionservice.pro"/>
+</component>
+</collection>
+<collection name="cbs" long-name="Cellular Baseband Services" level="utils">
+<component name="cbsserver" filter="s60" long-name="CBS Server">
+<unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
+</component>
+</collection>
 <collection name="cellular" long-name="Cellular" level="server">
-<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development"/>
-<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development"/>
-<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development"/>
+<component name="telephonysettings" filter="s60" long-name="Telephony Settings" purpose="development">
+<unit bldFile="mw/phonesrv/cellular/telephonysettings/group" filter="!test"/>
+</component>
+<component name="psetwrapper" filter="s60" long-name="Provider Settings Wrapper" introduced="^4">
+<!-- need to move to own component, not under sssettings -->
+<unit bldFile="mw/phonesrv/cellular/telephonysettings/xqbindings/psetwrapper" proFile="psetwrapper.pro"/>
+</component>
+<component name="sssettings" filter="s60" long-name="Supplementary Service Settings" purpose="development">
+<unit bldFile="mw/phonesrv/cellular/sssettings/group" filter="!test"/>
+</component>
+<component name="sssettingswrapper" filter="s60" long-name="Supplementary Service Settings Wrapper" introduced="^4">
+<!-- need to move to own component, not under sssettings -->
+<unit bldFile="mw/phonesrv/cellular/sssettings/xqbindings/sssettingswrapper" proFile="sssettingswrapper.pro"/>
+</component>
+<component name="psetnotesui" filter="s60" long-name="Phone Settings Notes UI" purpose="development">
+<unit bldFile="mw/phonesrv/cellular/psetnotesui/group" filter="!test"/>
+</component>
+<component name="servicerequest" filter="s60" long-name="Service Request">
+<unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
+</component>
 </collection>
 <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-<component name="cce" filter="s60" long-name="CCE" purpose="development"/>
-<component name="spsettings" filter="s60" long-name="Service Provider Settings" purpose="development"/>
+<component name="callprovider" filter="s60" long-name="Call Provider">
+<unit bldFile="mw/phonesrv/convergedcallengine/callprovider/group"/>
+</component>
+<component name="cce" filter="s60" long-name="CCE">
+<unit bldFile="mw/phonesrv/convergedcallengine/cce/group" filter="!test"/>
+</component>
+<component name="spsettings" filter="s60" long-name="Service Provider Settings">
+<unit bldFile="mw/phonesrv/convergedcallengine/spsettings/group" filter="!test"/>
+</component>
+<component name="cenrepdatabase" filter="s60" long-name="CCE Cenrep Database">
+<unit bldFile="mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
+</component>
+<component name="serviceselector" filter="s60" long-name="Service Selector">
+<unit bldFile="mw/phonesrv/convergedcallengine/serviceselector/group"/>
+</component>
+</collection>
+<collection name="networkhandling" long-name="Network Handling" level="framework">
+<component name="networkhandlingengine" filter="s60" long-name="Network Handling Engine">
+<unit bldFile="mw/phonesrv/networkhandling/networkhandlingengine/group"/>
+</component>
 </collection>
 <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data" purpose="development"/>
-<component name="dialutils" filter="s60" long-name="Dial Utils" purpose="development"/>
-<component name="phoneclient" filter="s60" long-name="Phone Client" purpose="development"/>
-</collection>
-<collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
-<component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-<unit bldFile="mw/phonesrv" proFile="phonesrv.pro"/>
+<component name="enpolicy" filter="s60" long-name="Emergency Number Policy">
+<unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
+</component>
+<component name="aiwdialdata" filter="s60" long-name="AIW Dial Data">
+<unit bldFile="mw/phonesrv/phoneclientserver/aiwdialdata/group" filter="!test"/>
+</component>
+<component name="dialutils" filter="s60" long-name="Dial Utils">
+<unit bldFile="mw/phonesrv/phoneclientserver/dialutils/group" filter="!test"/>
+</component>
+<component name="phoneclient" filter="s60" long-name="Phone Client">
+<unit bldFile="mw/phonesrv/phoneclientserver/phoneclient/group" filter="!test"/>
+</component>
+<component name="phoneserver" filter="s60" long-name="Phone Server">
+<unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
+</component>
+</collection>
+<collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
+<component name="phonecmdhnlr" filter="s60" long-name="Phone Command Handler">
+<unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
+</component>
+</collection>
+<collection name="satengine" long-name="SAT Engine" level="server">
+<component name="satserver" filter="s60" long-name="SAT Server">
+<unit bldFile="mw/phonesrv/satengine/satserver/group"/>
+</component>
+</collection>
+<collection name="satui" long-name="SAT UI" level="ui">
+<component name="satshellcontroller" filter="s60" long-name="SAT Shell Controller">
+<unit bldFile="mw/phonesrv/satui/satshellcontroller/group"/>
+</component>
+<component name="satapp" filter="s60" long-name="SAT Application" introduced="^4">
+<unit bldFile="mw/phonesrv/satui/satapp" proFile="satapp.pro"/>
+</component>
+</collection>
+<collection name="vmbx" long-name="Voice Mailbox" level="ui">
+<component name="vmbxcpplugin" filter="s60" long-name="Voice Mailbox CP Plugin" introduced="^4" plugin="Y">
+<unit bldFile="mw/phonesrv/vmbx/vmbxcpplugin" proFile="vmbxcpplugin.pro"/>
+</component>
+<component name="vmbxengine" filter="s60" long-name="Voice Mailbox Engine" introduced="^4">
+<unit bldFile="mw/phonesrv/vmbx/vmbxengine" proFile="vmbxengine.pro"/>
 </component>
 </collection>
 </block>
@@ -4368,11 +4346,6 @@
 <component name="searchserver" long-name="Search Server" filter="s60" introduced="^4">
 <unit bldFile="mw/searchsrv/searcher/SearchServer/group"/>
 </component>
-<component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
-<!-- #include from common bld.inf or split into two components -->
-<unit bldFile="mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
-<unit bldFile="mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
-</component>
 </collection>
 <collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
 <component name="searchsrv_pluginfw" long-name="Search Server" filter="s60" introduced="^4">
@@ -4388,8 +4361,9 @@
 </component>
 </collection>
 <collection name="qcpix" long-name="Qt CPIX" level="engine">
-<component name="qcpix_build" long-name="Qt CPIX Build" introduced="^4">
-<unit bldFile="mw/searchsrv/qcpix" proFile="qcpix.pro"/>
+<component name="qcpixsearchclient" long-name="Qt CPIX Search Client" introduced="^4">
+<!-- Snag! qcpix.pro and qcpixsearchclient.pro in same directory! -->
+<unit bldFile="mw/searchsrv/qcpix" proFile="qcpixsearchclient.pro"/>
 </component>
 </collection>
 <collection name="searchsrv_info" long-name="Search Services Info">
@@ -4502,6 +4476,9 @@
 <component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
 </component>
+<component name="devicemgmt_dialogs_api" long-name="Device Management Dialogs API" filter="s60" introduced="^4" class="api">
+<unit bldFile="mw/remotemgmt/remotemgmt_plat/devicemgmt_dialogs_api/group"/>
+</component>
 </collection>
 <collection name="policymanagement" long-name="Policy Management" level="generic">
 <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
@@ -4658,17 +4635,17 @@
 </component>
 </collection>
 <collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
-<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional">
+<component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional" filter="s60">
 <unit bldFile="mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
 </component>
 </collection>
 <collection name="upnp" long-name="UPnP" level="server">
-<component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional">
+<component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional" filter="s60">
 <unit bldFile="mw/srvdiscovery/upnp/upnpstack/group"/>
 </component>
 </collection>
 <collection name="srvdiscovery_info" long-name="Service Discovery and Usage Info" level="specific">
-<component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="^2" purpose="development" class="config PC">
+<component name="srvdiscovery_metadata" long-name="Service Discovery and Usage Metadata" introduced="^2" purpose="development" filter="s60" class="config PC">
 <unit mrp="mw/srvdiscovery/srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
 </component>
 </collection>
@@ -4880,19 +4857,19 @@
 <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
 </component>
 <component name="bluetooth_engine_connection_management_api" long-name="Bluetooth Engine Connection Management API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group" filter="!test"/>
 </component>
 <component name="bluetooth_engine_device_management_api" long-name="Bluetooth Engine Device Management API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group" filter="!test"/>
 </component>
 <component name="bluetooth_engine_discovery_api" long-name="Bluetooth Engine Discovery API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group" filter="!test"/>
 </component>
 <component name="bluetooth_engine_features_api" long-name="Bluetooth Engine Features API" filter="s60" class="api">
 <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
 </component>
 <component name="bluetooth_engine_settings_api" long-name="Bluetooth Engine Settings API" filter="s60" class="api">
-<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
+<unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_settings_api/group" filter="!test"/>
 </component>
 <component name="bluetooth_engine_plugin_api" long-name="Bluetooth Engine Plugin API" filter="s60" class="api">
 <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
@@ -4909,6 +4886,18 @@
 <component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
 <unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
 </component>
+<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/obex_secondary_display_notification_api/group"/>
+</component>
+<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/obex_service_plugin_api/group"/>
+</component>
+<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/obex_service_utils_api/group"/>
+</component>
+<component name="usb_obexservicemanager_client_api" long-name="OBEX Service Manager Client API" filter="s60" class="api">
+<unit bldFile="mw/btservices/btservices_plat/usb_obexservicemanager_client_api/group"/>
+</component>
 </collection>
 <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
 <component name="btnotifclient" filter="s60" long-name="Bluetooth Notification Client" introduced="^4">
@@ -4919,7 +4908,7 @@
 <unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
 </component>
 <component name="btserviceutil" filter="s60" long-name="Bluetooth Service Utils" introduced="^4">
-<unit bldFile="mw/btservices/bluetoothengine/btserviceutil/group"/>
+<unit bldFile="mw/btservices/bluetoothengine/btserviceutil/group" filter="!test"/>
 </component>
 <component name="btnotif" filter="s60" long-name="Bluetooth Notifier">
 <unit bldFile="mw/btservices/bluetoothengine/btnotif/group"/>
@@ -4928,7 +4917,7 @@
 <unit bldFile="mw/btservices/bluetoothengine/btnotif/btdevicedialogplugin" proFile="btdevicedialogplugin.pro"/>
 </component>
 <component name="btaudioman" filter="s60" long-name="Bluetooth Audio Manager">
-<unit bldFile="mw/btservices/bluetoothengine/btaudioman/group"/>
+<unit bldFile="mw/btservices/bluetoothengine/btaudioman/group" filter="!test"/>
 </component>
 <component name="btmac" filter="s60" long-name="Bluetooth Mono Audio Controller" plugin="Y">
 <unit bldFile="mw/btservices/bluetoothengine/btmac/group"/>
@@ -4937,7 +4926,7 @@
 <unit bldFile="mw/btservices/bluetoothengine/btsac/group"/>
 </component>
 <component name="btaudiostreamer" filter="s60" long-name="Bluetooth Audio Streamer">
-<unit bldFile="mw/btservices/bluetoothengine/btaudiostreamer/group"/>
+<unit bldFile="mw/btservices/bluetoothengine/btaudiostreamer/group" filter="!test"/>
 </component>
 <component name="btsap" filter="s60" long-name="Bluetooth SIM Access Profile" plugin="Y">
 <unit bldFile="mw/btservices/bluetoothengine/btsap/group"/>
@@ -4968,11 +4957,26 @@
 <unit bldFile="mw/btservices/atcommands/lccustomplugin/group"/>
 </component>
 </collection>
-<collection name="cbsatplugin" long-name="CBS AT Plugin">
+<collection name="cbsatplugin" long-name="CBS AT Plugin" level="plugin">
 <component name="atmisccmdplugin" long-name="AT Misc Commands Plugin" filter="s60" introduced="^4" plugin="Y">
 <unit bldFile="mw/btservices/cbsatplugin/atmisccmdplugin/group"/>
 </component>
 </collection>
+<collection name="btobexprofiles" long-name="BT OBEX Profiles" level="generic">
+<component name="obexreceiveservices" long-name="OBEX Receive Services" filter="s60">
+<unit bldFile="mw/btservices/btobexprofiles/obexreceiveservices/group"/>
+</component>
+<component name="obexsendservices" long-name="OBEX Send Services" filter="s60">
+<unit bldFile="mw/btservices/btobexprofiles/obexsendservices/group"/>
+</component>
+<component name="obexhighway" long-name="OBEX Highway" filter="s60" introduced="^4">
+<!-- should be moved out from under obexsendservices into own component dir -->
+<unit bldFile="mw/btservices/btobexprofiles/obexsendservices/obexhighway" proFile="obexhighway.pro"/>
+</component>
+<component name="obexserviceman" long-name="OBEX Service Manager" filter="s60">
+<unit bldFile="mw/btservices/btobexprofiles/obexserviceman/group"/>
+</component>
+</collection>
 <collection name="btservices_info" long-name="BT Services Info" level="plugin">
 <component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
 <unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
@@ -5039,26 +5043,13 @@
 <component name="usbmscpersonality" filter="s60" long-name="USB MSC Personality" plugin="Y">
 <unit bldFile="mw/usbservices/usbclasses/usbmscpersonality/group"/>
 </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
-      </component>-->
-<component name="pictbridgeengine" filter="s60" long-name="PictBridge Engine">
-<unit bldFile="mw/usbservices/usbclasses/pictbridgeengine/group"/>
-</component>
 <component name="usbphoneasmodem" filter="s60" long-name="USB Phone as Modem" introduced="^3">
 <unit bldFile="mw/usbservices/usbclasses/usbphoneasmodem/group"/>
 </component>
 </collection>
 <collection name="usbuis" long-name="USB UIs" level="specific">
 <component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
-<unit bldFile="mw/usbservices/usbuis/usbuinotif/group"/>
+<unit bldFile="mw/usbservices/usbuis/usbuinotif" proFile="usbuinotif.pro" qmakeArgs="-r"/>
 </component>
 <component name="imageprintuiprovider" filter="s60" long-name="ImagePrint UI Provider" plugin="Y">
 <unit bldFile="mw/usbservices/usbuis/imageprintuiprovider/group"/>
@@ -5075,62 +5066,6 @@
 </collection>
 <collection name="usbservices_test" long-name="USB Services Test" level="server"/>
 </block>
-<block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
-<!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
-<collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-<component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-</component>
-<component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-</component>
-<component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-</component>
-<component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-</component>
-<component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-</component>
-<component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
-</component>
-<component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
-</component>
-<component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
-<unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
-</component>
-</collection>
-<collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-<component name="locod" long-name="Local Connectivity Daemon">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
-</component>
-<component name="obexserviceman" long-name="OBEX Service Managar">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-</component>
-<component name="obexsendservices" long-name="OBEX Send Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-</component>
-<component name="obexhighway" long-name="OBEX Highway" introduced="^4">
-<!-- component must be moved to its own directory. Components cannot live in others component's directories -->
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexsendservices/obexhighway" proFile="obexhighway.pro"/>
-</component>
-<component name="obexreceiveservices" long-name="OBEX Receive Services">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-</component>
-<component name="dun" long-name="Dial Up Networking">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/dun/group"/>
-</component>
-<component name="generichid" long-name="Generic HID">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-</component>
-<component name="headset" long-name="Headset">
-<unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
-</component>
-</collection>
-</block>
 <block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
 <collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
 <component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
@@ -5311,7 +5246,7 @@
 <unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
 </component>
 <component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group" filter="!test"/>
 </component>
 <component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
@@ -5323,7 +5258,7 @@
 <unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
 </component>
 <component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group" filter="!test"/>
 </component>
 <component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
@@ -5338,13 +5273,13 @@
 <unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
 </component>
 <component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group" filter="!test"/>
 </component>
 <component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
 </component>
 <component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group" filter="!test"/>
 </component>
 <component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
@@ -5353,10 +5288,10 @@
 <unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
 </component>
 <component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group" filter="!test"/>
 </component>
 <component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group" filter="!test"/>
 </component>
 <component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
@@ -5365,13 +5300,13 @@
 <unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
 </component>
 <component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group" filter="!test"/>
 </component>
 <component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
 </component>
 <component name="openmax_al_api" long-name="OpenMAX AL API" filter="s60" introduced="^4" class="api">
-<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group"/>
+<unit bldFile="mw/mmmw/mmmw_plat/openmax_al_api/group" filter="!test"/>
 </component>
 <component name="openmax_al_ext_api" long-name="OpenMAX AL Extensions API" filter="s60" introduced="^4" class="api">
 <unit bldFile="mw/mmmw/mmmw_plat/openmax_al_ext_api/group"/>
@@ -5404,6 +5339,7 @@
 <component name="profilesettingsmonitor" filter="s60" long-name="Profile Settings Monitor">
 <unit bldFile="mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
 </component>
+<component name="mmfenh_test" filter="s60,test,module_test,pref_test" long-name="MMF Enhancements Tests" purpose="development"/>
 </collection>
 <collection name="mmserv" long-name="Multimedia Services" level="specific">
 <component name="callaudiocontrol" filter="s60" long-name="Call Audio Control">
@@ -5675,7 +5611,7 @@
 </collection>
 <collection name="ganeswidgets" long-name="Ganes Widgets" level="service">
 <!-- really a component, should move down a dir level and have a unit -->
-<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4">
+<component name="ganeswidgets_build" long-name="Ganes Widgets Build" introduced="^4" filter="build_as_app">
 <unit bldFile="mw/hgwidgets/ganeswidgets" proFile="ganeswidgets.pro"/>
 </component>
 </collection>
@@ -5688,9 +5624,6 @@
 </block>
 <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
 <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
-<component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
-</component>
 <component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
 <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
 </component>
@@ -5711,9 +5644,6 @@
 <component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
 <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
 </component>
-<component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
-</component>
 <component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
 <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
 </component>
@@ -5740,7 +5670,7 @@
 </collection>
 <collection name="fep" long-name="FEP" level="engine">
 <component name="aknfep" filter="s60" long-name="Avkon FEP" plugin="Y">
-<unit bldFile="mw/inputmethods/fep/aknfep/group"/>
+<unit bldFile="mw/inputmethods/fepstub/group"/>
 </component>
 <component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory">
 <unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
@@ -5772,7 +5702,7 @@
 <component name="qtecomplugins_build" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4" plugin="Y">
 <unit bldFile="mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
 </component>
-<component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
+<component name="qtextensions_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
 <unit bldFile="mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
 </component>
 </collection>
@@ -5780,7 +5710,7 @@
 <component name="qthighway_build" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
 <unit bldFile="mw/qtextensions/qthighway" proFile="qthighway.pro" qmakeArgs="-r"/>
 </component>
-<component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
+<component name="qthighway_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt Highway Examples" purpose="development" introduced="^4">
 <unit bldFile="mw/qtextensions/qthighway/examples" proFile="examples.pro" qmakeArgs="-r"/>
 </component>
 </collection>
@@ -5788,7 +5718,7 @@
 <component name="qtmobileextensions_build" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
 <unit bldFile="mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro" qmakeArgs="-r"/>
 </component>
-<component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
+<component name="qtmobileextensions_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
 <unit bldFile="mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
 </component>
 </collection>
@@ -5796,7 +5726,7 @@
 <component name="qtmobility_build" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
 <unit bldFile="mw/qtextensions/qtmobility" proFile="qtmobility.pro" qmakeArgs="-r"/>
 </component>
-<component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
+<component name="qtmobility_examples" filter="qtextensionsexamples,build_as_app" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
 <unit bldFile="mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
 </component>
 </collection>
@@ -6006,7 +5936,7 @@
 <unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
 </component>
 <component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+<unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group"/>
 </component>
 <component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
@@ -6112,7 +6042,7 @@
 <unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
 </component>
 <component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group"/>
 </component>
 <component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
 <unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
@@ -6970,7 +6900,7 @@
 <block name="browser" level="specific" long-name="Browser" levels="plugin utils support main">
 <collection name="bookmarksengine" long-name="Bookmarks Engine" level="support">
 <component name="bookmarksengine_build" long-name="Bookmarks Engine Build" introduced="^4">
-<unit bldFile="mw/browser/bookmarksengine" proFile="bookmarksengine.pro" qmakeArgs="&quot;what+=plat_101&quot;"/>
+<unit bldFile="mw/browser/bookmarksengine" proFile="bookmarksengine.pro"/>
 </component>
 </collection>
 </block>
@@ -7110,9 +7040,6 @@
 <component name="widgetregistry" filter="s60" long-name="Widget Registry">
 <unit bldFile="mw/web/webengine/widgetregistry/group"/>
 </component>
-<component name="wmlengine" filter="s60" long-name="WML Engine">
-<unit bldFile="mw/web/webengine/wmlengine/group"/>
-</component>
 <component name="device" filter="s60" long-name="Device">
 <!-- this needs a more meaningful name -->
 <unit bldFile="mw/web/webengine/device/group"/>
@@ -7311,7 +7238,7 @@
 <!-- need to break up this package into collections and components -->
 <collection name="webruntime_info" long-name="Web Runtime Info">
 <component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs="&quot;what+=qtsfw&quot; &quot;what+=qt_unstable&quot; &quot;what+=tenone&quot; &quot;what+=usif&quot; &quot;what+=services&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
+<unit bldFile="mw/webruntime" proFile="cwrt.pro" qmakeArgs="&quot;what+=qtsfw&quot; &quot;what+=tenone&quot; &quot;what+=usif&quot; &quot;what+=services&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
 </component>
 </collection>
 </block>
@@ -7463,9 +7390,6 @@
 <component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
 <unit bldFile="app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
 </component>
-<component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-<unit bldFile="app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
-</component>
 </collection>
 <collection name="phoneuis" long-name="Phone UIs" level="ui">
 <component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
@@ -7621,11 +7545,14 @@
 </component>
 </collection>
 </block>
-<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
+<block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="support mid app">
+<collection name="devicemgmtdialogsplugin" long-name="Device Management Dialogs Plugin" level="support">
+<!-- need to put component at the proper directory level -->
+<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/devicecontrol/devicemgmtdialogsplugin" proFile="devicemgmtdialogsplugin.pro"/>
+</component>
+</collection>
 <collection name="deviceupdatesui" long-name="Device Updates UI" level="app">
-<component name="deviceupdatesui_adapters" long-name="Device Updates Adapters" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/adapters/bld"/>
-</component>
 <component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
 <unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
 </component>
@@ -7635,11 +7562,67 @@
 <component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
 <unit bldFile="app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
 </component>
+</collection>
+<collection name="clientprovisioning" long-name="Client Provisioning" level="mid">
 <component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit bldFile="app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
-</component>
-<component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-<unit bldFile="app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
+<unit bldFile="app/devicecontrol/clientprovisioning/cpqtsp" proFile="cpqtsp.pro"/>
+</component>
+</collection>
+<collection name="omadmadapters" long-name="OMA DM Adapters" level="support">
+<component name="omadmadapters_build" long-name="OMA DM Adapters Build" filter="s60">
+<!-- need to split IBY into the components or make this a ROM component -->
+<unit bldFile="app/devicecontrol/omadmadapters/bld"/>
+</component>
+<component name="devinfo" long-name="Device Info" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/devinfo/bld"/>
+</component>
+<component name="devdetail" long-name="Device Detail" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/devdetail/bld"/>
+</component>
+<component name="syncmldm" long-name="SyncML DM" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/syncmldm/bld"/>
+</component>
+<component name="syncmldm12" long-name="SyncML DM 1.2" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/syncmldm12/bld"/>
+</component>
+<component name="omadm_browseradapter" long-name="Browser Adapter" filter="s60" plugin="Y" class="placeholder">
+<!--  <unit bldFile="omadmadapters/browseradapter/bld"/> -->
+</component>
+<component name="omadm_streamingadapter" long-name="Streaming Adapter" filter="s60" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/streamingadapter/bld"/>
+</component>
+<component name="globalwlansettings" long-name="Global WLAN Settings" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/globalwlansettings/group"/>
+</component>
+<component name="nsmldminternet" filter="s60" class="placeholder">
+<!--  <unit bldFile="omadmadapters/nsmldminternet/group"/> -->
+</component>
+<component name="nsmldmalwaysonadapter" long-name="Always Online Device Management Adapter" filter="s60" introduced="9.1" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/nsmldmalwaysonadapter/group"/>
+</component>
+<component name="nsmldmbmadapter" long-name="NSML DM BM Adapter" filter="s60" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/nsmldmbmadapter/group"/>
+</component>
+<component name="connmoadapter" long-name="Connection Management Object Adapter" filter="s60" plugin="Y">
+<unit bldFile="app/devicecontrol/omadmadapters/connmoadapter/group"/>
+</component>
+<component name="syncmlds" long-name="SyncML Data Sync" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/syncmlds/bld"/>
+</component>
+<component name="omadm_email" long-name="OMA DM Email" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/email/bld"/>
+</component>
+<component name="omadm_mms" long-name="OMA DM MMS" filter="s60">
+<unit bldFile="app/devicecontrol/omadmadapters/mms/bld"/>
+</component>
+<component name="omadm_fota" long-name="OMA DM FOTA" filter="s60">
+<!--  <unit bldFile="omadmadapters/fota/bld"/> -->
+</component>
+<component name="omadm_imps" long-name="OMA DM IMPS" filter="s60">
+<!--  <unit bldFile="omadmadapters/imps/bld"/> -->
+</component>
+<component name="dcmodmadapter" long-name="DC Management Object  DM Adapter" filter="s60" plugin="Y" class="placeholder">
+<!--  <unit bldFile="omadmadapters/dcmodmadapter/group"/> -->
 </component>
 </collection>
 </block>
@@ -7698,7 +7681,7 @@
 <unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
 </component>
 <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
+<unit bldFile="app/contacts/phonebookengines_old/contactsmodel/groupsql" mrp="app/contacts/phonebookengines_old/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
 </component>
 <component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
 <unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
@@ -7707,17 +7690,17 @@
 <!-- need to move to this actual dir rather than including something from another collection -->
 <unit bldFile="app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
 </component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
+<component name="cntlistmodel" filter="s60" long-name="Contact List Model" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntlistmodel" proFile="cntlistmodel.pro"/>
+</component>
+<component name="cntactions" filter="s60" long-name="Contacts Actions" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntactions" proFile="cntactions.pro"/>
 </component>
 <component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
 <unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
 </component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
+<component name="cntsimutility" filter="s60" long-name="Contacts SIM Utility" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntsimutility" proFile="cntsimutility.pro"/>
 </component>
 <component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
 <unit bldFile="app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
@@ -7727,10 +7710,18 @@
 <component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
 <unit bldFile="app/contacts/pimprotocols/phonebooksync/group" mrp="app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
 </component>
-<component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+<component name="pbap" filter="s60" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
 <unit bldFile="app/contacts/pimprotocols/pbap/group" mrp="app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
 </component>
 </collection>
+<collection name="presencecache" long-name="Presence Cache" level="support">
+<component name="presencecachesymbian" filter="s60" long-name="Presence Cache Symbian" introduced="^4">
+<unit bldFile="app/contacts/presencecache/presencecachesymbian" proFile="presencecachesymbian.pro"/>
+</component>
+<component name="presencecacheqt" filter="s60" long-name="Presence Cache Qt" introduced="^4">
+<unit bldFile="app/contacts/presencecache/presencecacheqt" proFile="presencecacheqt.pro"/>
+</component>
+</collection>
 <collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
 <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
 <unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
@@ -7764,6 +7755,7 @@
 <component name="agenda_interface_api" long-name="Agenda Interface API" filter="s60" introduced="^4" class="api"/>
 <component name="calendar_editor_api" long-name="Calendar Editor API" filter="s60" introduced="^4" class="api"/>
 <component name="notes_editor_api" long-name="Notes Editor API" filter="s60" introduced="^4" class="api"/>
+<component name="clock_settingsview_plugin_api" long-name="Clock Settings View Plugin API" filter="s60" introduced="^4" class="api"/>
 </collection>
 <collection name="agendainterface" long-name="Agenda Interface" level="services">
 <!-- collection is really a component, should move down a directory -->
@@ -7796,7 +7788,7 @@
 <component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
 <unit bldFile="app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
 </component>
-<component name="views" filter="s60" long-name="Calendar Views">
+<component name="calendarui_views" filter="s60" long-name="Calendar Views">
 <unit bldFile="app/organizer/calendarui/views" proFile="views.pro"/>
 </component>
 <component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
@@ -7808,14 +7800,14 @@
 <component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
 <unit bldFile="app/organizer/calendarui/regionalplugins" proFile="regionalplugins.pro"/>
 </component>
+<component name="calenviewerservice" long-name="Calendar Viewer Service" filter="s60" introduced="^4" plugin="Y">
+<unit bldFile="app/organizer/calendarui/calenviewerservice" proFile="calenviewerservice.pro"/>
+</component>
 <component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y" class="placeholder">
 <!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
 </component>
 </collection>
 <collection name="notes" long-name="Notes" level="ui">
-<component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-<unit bldFile="app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
-</component>
 <component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
 <unit bldFile="app/organizer/notes" proFile="notes.pro"/>
 </component>
@@ -7902,6 +7894,7 @@
 <component name="messaging_history_api" long-name="Messaging History API" filter="s60" introduced="^4" class="api"/>
 <component name="msg_plat_build" long-name="Messaging Apps Platform APIs Build" filter="s60" introduced="^4" class="api">
 <!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit bldFile="app/messaging/msg_plat" proFile="msg_plat.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="msg_pub" long-name="Messaging Apps Public APIs" level="api">
@@ -7909,6 +7902,7 @@
 <component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
 <component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
 <!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit bldFile="app/messaging/msg_pub" proFile="msg_pub.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">
@@ -8099,7 +8093,7 @@
 <collection name="commonemail_info" long-name="Email Apps Info" level="app">
 <component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
 <!-- split into actual components -->
-<unit bldFile="app/commonemail" proFile="nmail.pro" qmakeArgs="-r"/>
+<unit bldFile="app/commonemail/group"/>
 </component>
 </collection>
 </block>
@@ -8123,7 +8117,7 @@
 </collection>
 <collection name="videocollection" long-name="Video Collection" level="util">
 <component name="mpxmyvideoscollection" filter="s60" long-name="MPX My Videos Collection" introduced="^3">
-<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
+<unit bldFile="app/videoplayer/videocollection/mpxmyvideoscollection/group" filter="!test"/>
 </component>
 <component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
 <unit bldFile="app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
@@ -8136,17 +8130,19 @@
 </component>
 </collection>
 <collection name="mediasettings" long-name="Media Settings" level="support">
-<!--  this is really a component. Should be moved down a directory -->
-<component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
-<unit bldFile="app/videoplayer/mediasettings/group"/>
+<component name="mediasettingsengine" filter="s60" long-name="Media Settings Engine">
+<unit bldFile="app/videoplayer/mediasettings/mediasettingsengine/group"/>
+</component>
+<component name="videosettingsplugin" filter="s60" long-name="Video Settings Plugin" plugin="Y" class="placeholder">
+<!--<unit bldFile="mediasettings/videosettingsplugin" qt:proFile="videosettingsplugin.pro"/> -->
 </component>
 </collection>
 <collection name="videoplayerapp" long-name="Video Player App" level="apps">
 <component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
 <unit bldFile="app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
 </component>
-<component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-<unit bldFile="app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
+<component name="hbvideoplayer" filter="s60" long-name="Video Player" introduced="^4">
+<unit bldFile="app/videoplayer/videoplayerapp/videoplayer" proFile="videoplayer.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
@@ -8157,7 +8153,7 @@
 <unit bldFile="app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
 </component>
 <component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-<unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
+<unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
 </component>
 </collection>
 </block>
@@ -8181,12 +8177,22 @@
 </component>
 </collection>
 <collection name="photos_ui" long-name="Photos UI" level="ui">
+<!-- need to move exports from ui.pro into separate .pro or bld.inf -->
+<component name="detailscustomwidget " filter="s60" long-name="Details Custom Widget" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/detailscustomwidget " qt:proFile="detailscustomwidget .pro"/> -->
+</component>
 <component name="photos_uiengine" filter="s60" long-name="Photos UI Engine" introduced="^4" class="placeholder">
 <!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
 </component>
 <component name="photos_commandhandlers" filter="s60" long-name="Photos Command Handlers" introduced="^4" class="placeholder">
 <!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
 </component>
+<component name="photos_viewutilities" filter="s60" long-name="Photos View Utilities" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/viewutilities" qt:proFile="commandhandlers.pro"/> -->
+</component>
+<component name="photos_widgets" filter="s60" long-name="Photos Widgets" introduced="^4" class="placeholder">
+<!--<unit bldFile="ui/widgets" qt:proFile="widgets.pro"/> -->
+</component>
 <component name="photos_views" filter="s60" long-name="Photos Views" introduced="^4" class="placeholder">
 <!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
 </component>
@@ -8218,6 +8224,18 @@
 </block>
 <block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support engine app">
 <!-- move the rom .pri files into their components and uncomment the units -->
+<collection name="mpdata " long-name="Music Player Data" level="support">
+<!-- collection is really a component, move down a directory -->
+<component name="mpdata_build" filter="s60" long-name="Music Player Data Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="mpdata" qt:proFile="mpdata.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
+<collection name="mpengine " long-name="Music Player Engine" level="engine">
+<!-- collection is really a component, move down a directory -->
+<component name="mpengine_build" filter="s60" long-name="Music Player Engine Build" introduced="^4" class="placeholder">
+<!-- <unit bldFile="mpengine" qt:proFile="mpengine.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
 <collection name="musicplayer_utilities " long-name="Music Player Utilities" level="support">
 <component name="mpnowplayingbanner" filter="s60" long-name="MP Now Playing Banner" introduced="^4" class="placeholder">
 <!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
@@ -8238,18 +8256,6 @@
 <!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection name="mpdata " long-name="Music Player Data" level="support">
-<!-- collection is really a component, move down a directory -->
-<component name="mpdata_build" filter="s60" long-name="Music Player Data Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="mpdata" qt:proFile="mpdata.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection name="mpengine " long-name="Music Player Engine" level="engine">
-<!-- collection is really a component, move down a directory -->
-<component name="mpengine_build" filter="s60" long-name="Music Player Engine Build" introduced="^4" class="placeholder">
-<!-- <unit bldFile="mpengine" qt:proFile="mpengine.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
 <collection name="mpviewplugins" long-name="Music Player View Plugins" level="plugins">
 <component name="mpcollectionviewplugin" filter="s60" long-name="MP Collection View Plugin" introduced="^4" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpviewplugins/mpcollectionviewplugin" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
@@ -8267,6 +8273,11 @@
 <!--<unit bldFile="mpviewplugins/mpmediawallviewplugin" qt:proFile="mpmediawallviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
+<collection name="musicwidgetplugin" long-name="Music Widget Plugin" level="plugins">
+<component name="musicwidgetplugin_build" filter="s60" long-name="Music Widget Plugin" introduced="^4" plugin="Y" class="placeholder">
+<!--<unit bldFile="musicwidgetplugin" qt:proFile="musicwidgetplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+</component>
+</collection>
 <collection name="mpserviceplugins" long-name="Music Player Service Plugins" level="plugins">
 <component name="audioeffects" filter="s60" long-name="Audio Effects" introduced="^4" plugin="Y" class="placeholder">
 <!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
@@ -8333,15 +8344,10 @@
 <unit bldFile="app/radio/rom"/>
 </component>
 </collection>
-<collection name="radio_hswidgetplugin" long-name="FM Radio Homescreen Widget Plugin" level="plugin">
-<component name="fmradiohswidgetplugin" filter="s60" long-name="FM Radio HS Widget Plugin" introduced="^4" plugin="Y">
-<unit bldFile="app/radio/hswidgetplugin/fmradiohswidgetplugin" proFile="fmradiohswidgetplugin.pro"/>
-</component>
-<component name="fmradiohswidgetplugininstaller" filter="s60" long-name="FM Radio HS Widget Plugin Installer" introduced="^4">
-<unit bldFile="app/radio/hswidgetplugin/fmradiohswidgetplugininstaller" proFile="fmradiohswidgetplugininstaller.pro"/>
-</component>
-<component name="fmradiohswidgetplugin_exports_to_rom" filter="s60" long-name="FM Radio HS Widget Plugin ROM" introduced="^4">
-<unit bldFile="app/radio/hswidgetplugin" proFile="fmradiohswidgetplugin_exports_to_rom.pri"/>
+<collection name="radiohswidget" long-name="Radio Homescreen Widget" level="plugin">
+<!-- collection is really a component. Move down a directory -->
+<component name="radiohswidget_build" filter="s60" long-name="Radio HS Widget Build" introduced="^4">
+<unit bldFile="app/radio/radiohswidget" proFile="radiohswidget.pro"/>
 </component>
 </collection>
 </block>
@@ -8487,7 +8493,7 @@
 <block name="browserui" level="services" long-name="Browser UI" levels="utils support ui">
 <collection name="browserui_info" long-name="Browser UI Info" level="ui">
 <component name="browserui_build" long-name="Bookmarks Engine Build" introduced="^4">
-<unit bldFile="app/browserui" proFile="browserui.pro" qmakeArgs="&quot;what+=plat_101&quot;"/>
+<unit bldFile="app/browserui" proFile="browserui.pro"/>
 </component>
 </collection>
 </block>
@@ -8581,11 +8587,6 @@
 <unit bldFile="app/helps/symhelp/helpmodel/group" mrp="app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
 </component>
 </collection>
-<collection name="helps_info" long-name="Help Apps Info" level="ui">
-<component name="helps_metadata" long-name="Help Apps Metadata" introduced="^2" purpose="development" class="config PC">
-<unit mrp="app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-</component>
-</collection>
 </block>
 <block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
 <collection name="buildverification" long-name="Build Verification" level="services">

--- a/symbian4/single/sysdefs/system_model_3.0.xml	Wed Jun 30 17:01:33 2010 +0100
+++ b/symbian4/single/sysdefs/system_model_3.0.xml	Wed Jun 30 17:04:40 2010 +0100
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><SystemDefinition id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition xmlns:qt="http://www.nokia.com/qt" id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
 <systemModel name="Symbian^4">
 <layer id="adaptation" name="Adaptation" levels="low mw high">
 <package id="stubs" tech-domain="hb" level="high" span="2" name="Stubs" levels="adaptation plugin mid engine">
@@ -279,7 +280,7 @@
 <component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
 </component>
-<component id="kernelhwsrv_docpub" name="Kernel and Hardware Services Public Documentation" class="doc" introduced="^3" purpose="development">
+<component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Public Documentation" class="doc" introduced="^3" purpose="development">
 <unit mrp="/os/kernelhwsrv/kernelhwsrv_info/doc_pub/kernelhwsrv_doc_pub.mrp"/>
 </component>
 </collection>
@@ -502,7 +503,7 @@
 <unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
 </component>
 <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+<!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
 <unit bldFile="/os/ossrv/ofdbus/group"/>
 </component>
@@ -934,7 +935,9 @@
 <meta rel="config">
 <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
 </meta>
-<unit bldFile="/os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/>
+<!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+      		may need to  -->
+<!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
 </component>
 <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
 <unit bldFile="/os/devicesrv/resourcemgmt/vibractrl/group"/>
@@ -945,8 +948,9 @@
 <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
 <unit bldFile="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig" mrp="/os/devicesrv/resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
 </component>
-<component id="resourcemgmt_data" filter="s60" name="Resource Management Data" class="config">
-<!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
+<component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
+<!-- Move exports to a self-contained component.
+         	This needs to be kept around until configuration is in place -->
 <unit bldFile="/os/devicesrv/resourcemgmt/group"/>
 </component>
 <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
@@ -1971,7 +1975,7 @@
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
 </component>
 <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-<!-- need to #include the lot from a single bld.inf
+<!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
 <unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2171,7 +2175,7 @@
 <component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
 <unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
 </component>
-<component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^3">
+<component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^4">
 <unit bldFile="/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
 </component>
 </collection>
@@ -2321,8 +2325,7 @@
 <component id="gdi" name="GDI" purpose="mandatory">
 <unit bldFile="/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
 </component>
-<component id="bitgdi" name="BitGDI" purpose="mandatory" filter="api_test">
-<!-- just api_test, not test -->
+<component id="bitgdi" name="BitGDI" purpose="mandatory">
 <unit bldFile="/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
 </component>
 <component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
@@ -2353,6 +2356,9 @@
 </package>
 <package id="textandloc" level="services" tech-domain="ui" name="Text and Localisation Services" levels="encoding util fonts tools text">
 <collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
+<component id="findutil_api" class="api" name="Find Util API" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_plat/findutil_api/group"/>
+</component>
 <component id="japanese_language_utilities_api" class="api" name="Japanese Language Utilities API" filter="s60">
 <unit bldFile="/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
 </component>
@@ -2360,6 +2366,11 @@
 <unit bldFile="/os/textandloc/textandloc_plat/sortutil_api/group"/>
 </component>
 </collection>
+<collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
+<component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
+<unit bldFile="/os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+</component>
+</collection>
 <collection id="charconvfw" name="Character Conversion" level="encoding">
 <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
 <unit bldFile="/os/textandloc/charconvfw/charconv_fw/group" mrp="/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
@@ -2399,16 +2410,19 @@
 </collection>
 <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
 <component id="numbergrouping" name="Number Grouping">
-<unit bldFile="/os/textandloc/textandlocutils/numbergrouping/group" mrp="/os/textandloc/textandlocutils/numbergrouping/group/tls_numbergrouping.mrp"/>
+<unit bldFile="/os/textandloc/charconvfw/numbergrouping/group"/>
 </component>
 <component id="jplangutil" name="Japanese Language Utilities">
-<unit bldFile="/os/textandloc/textandlocutils/jplangutil/group" mrp="/os/textandloc/textandlocutils/jplangutil/group/tls_jplangutil.mrp"/>
+<unit bldFile="/os/textandloc/charconvfw/jplangutil/group"/>
 </component>
 <component id="sortutil" name="Sorting Utility">
-<unit bldFile="/os/textandloc/textandlocutils/sortutil/group" mrp="/os/textandloc/textandlocutils/sortutil/group/tls_sortutil.mrp"/>
+<unit bldFile="/os/textandloc/charconvfw/sortutil/group"/>
 </component>
 <component id="inlinetext" name="Inline Text">
-<unit bldFile="/os/textandloc/textandlocutils/inlinetext/group" mrp="/os/textandloc/textandlocutils/inlinetext/group/tls_inlinetext.mrp"/>
+<unit bldFile="/os/textandloc/charconvfw/inlinetext/group"/>
+</component>
+<component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
+<!-- placeholder for split from bafl -->
 </component>
 <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
 <unit bldFile="/os/textandloc/textrendering/numberformatting/group" mrp="/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
@@ -2439,8 +2453,8 @@
 <package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
 <collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
 <component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
-<!-- need to fix the configuration used here. 
-	  Either destribute to other components or use the new feature flags confguration mechanisms.
+<!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
 	  Remove this component and uncomment the other units when fixed-->
 <unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
 </component>
@@ -2501,13 +2515,13 @@
 <collection id="s60extras" name="S60 Extras" level="mid">
 <!-- collection is really a component. Need to move down a directory -->
 <component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
-<unit bldFile="/os/deviceplatformrelease/s60extras/group"/>
+<unit bldFile="/os/deviceplatformrelease/S60Extras/group"/>
 </component>
 </collection>
 <collection id="version" name="Version" level="top">
 <!-- collection is really a component. Need to move down a directory -->
 <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
-<unit bldFile="/os/deviceplatformrelease/version/group"/>
+<unit bldFile="/os/deviceplatformrelease/Version/group"/>
 </component>
 </collection>
 <collection id="symbianosbld" name="Symbian OS Build" level="bld">
@@ -2522,7 +2536,7 @@
 <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
 </component>
-<component id="sf_config" filter="s60" name="Foundation Config" introduced="^4">
+<component id="sf_config" name="Foundation Config" introduced="^4">
 <unit bldFile="/os/deviceplatformrelease/foundation_system/sf_config/CI_external/group"/>
 </component>
 <component id="config" filter="s60" name="Config" class="config" purpose="development">
@@ -2545,7 +2559,7 @@
 </component>
 </collection>
 </package>
-<package id="osrndtools" level="services" tech-domain="to" name="OS R&amp;D tools" levels="fw trace analysis">
+<package id="osrndtools" level="services" tech-domain="to" name="OS R&amp;D tools" levels="fw trace">
 <collection id="stif" name="STIF" level="fw">
 <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
 <unit bldFile="/os/osrndtools/stif/stif_plat/group"/>
@@ -2590,36 +2604,31 @@
 <meta rel="config">
 <defined condition="__S60_"/>
 </meta>
-<unit bldFile="/os/osrndtools/stif/stifkerneltestclassbase/group"/>
-</component>
-<component id="stif_data" filter="s60" name="STIF Data" purpose="development" class="config">
-<!--  This is a component. Should move down a directory. or move into other STIF components-->
+<!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
+<!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+</component>
+<component id="stif_build" filter="s60" name="STIF Build" purpose="development">
+<!--  move exports into self-contained component. Remove this when configuration is in place-->
 <unit bldFile="/os/osrndtools/stif/group"/>
 </component>
 </collection>
-<collection id="memspy" name="MemSpy" level="trace">
-<component id="memspy_plat" filter="s60" name="MemSpy Platform Interfaces" class="api" purpose="development">
+<collection id="memspy" name="Memspy" level="trace">
+<component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/memspy_plat/group"/>
 </component>
-<component id="driver" filter="s60" name="MemSpy Driver" purpose="development">
+<component id="driver" filter="s60" name="Memspy Driver" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/driver/group"/>
 </component>
-<component id="memspy_engine" filter="s60" name="MemSpy Engine" purpose="development">
+<component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/engine/group"/>
 </component>
-<component id="commandline" filter="s60" name="MemSpy Command Line" purpose="development">
+<component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/commandline/group"/>
 </component>
-<component id="console" filter="s60" name="MemSpy Console" purpose="development">
+<component id="console" filter="s60" name="Memspy Console" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/console/group"/>
 </component>
-<component id="memspyserver" filter="s60" name="MemSpy Server" purpose="development" introduced="^4">
-<unit bldFile="/os/osrndtools/memspy/MemSpyServer/group"/>
-</component>
-<component id="memspyclient" filter="s60" name="MemSpy Client" purpose="development" introduced="^4">
-<unit bldFile="/os/osrndtools/memspy/MemSpyClient/group"/>
-</component>
-<component id="memspy_build" filter="s60" name="MemSpy Build" purpose="development">
+<component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
 <!--  move exports into self-contained component.-->
 <unit bldFile="/os/osrndtools/memspy/group"/>
 </component>
@@ -2663,16 +2672,6 @@
 <unit bldFile="/os/osrndtools/hti/group"/>
 </component>
 </collection>
-<collection id="piprofiler" name="Performance Investigator Profiler" level="analysis">
-<component id="piprofiler_build" name="Performance Investigator Profiler Build" introduced="^4">
-<unit bldFile="/os/osrndtools/piprofiler/group"/>
-</component>
-</collection>
-<collection id="analyzetool" name="Analyze Tool" level="analysis">
-<component id="analyzetool_build" name="Analyze Tool Build" introduced="^4">
-<unit bldFile="/os/osrndtools/analyzetool/group"/>
-</component>
-</collection>
 <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
 <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
@@ -2789,17 +2788,22 @@
 </component>
 </collection>
 <collection id="contextframework" name="Context Framework" level="framework">
+<!-- the units that are commented out need to be put back when configuration is in place.
+		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component id="cfw" filter="s60" name="Context Framework">
 <meta rel="config">
 <defined condition="RD_CONTEXT_FRAMEWORK"/>
 </meta>
-<unit bldFile="/mw/appsupport/contextframework/cfw/group"/>
+<!--<unit bldFile="contextframework/cfw/group"/> -->
 </component>
 <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
 <meta rel="config">
 <defined condition="RD_CONTEXT_FRAMEWORK"/>
 </meta>
-<unit bldFile="/mw/appsupport/contextframework/cfwplugins/group"/>
+<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
+</component>
+<component id="contextframework_build" filter="s60" name="Context Framework Build">
+<unit bldFile="/mw/appsupport/contextframework/group"/>
 </component>
 </collection>
 <collection id="coreapplicationuis" name="Core Application UIs" level="server">
@@ -3047,12 +3051,18 @@
 <component id="pkcs12" filter="s60" name="PKCS #12">
 <unit bldFile="/mw/securitysrv/pkiutilities/pkcs12/group"/>
 </component>
+<component id="certmanui" filter="s60" name="Certificate Management UI">
+<unit bldFile="/mw/securitysrv/pkiutilities/certmanui/group"/>
+</component>
 <component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
 <unit bldFile="/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
 </component>
 <component id="certsaver" filter="s60" name="Certificate Saver">
 <unit bldFile="/mw/securitysrv/pkiutilities/certsaver/group"/>
 </component>
+<component id="secmodui" filter="s60" name="Security Module UI">
+<unit bldFile="/mw/securitysrv/pkiutilities/secmodui/group"/>
+</component>
 <component id="devicetoken" filter="s60" name="Device Token">
 <unit bldFile="/mw/securitysrv/pkiutilities/devicetoken/group"/>
 </component>
@@ -3092,38 +3102,14 @@
 <component id="securitynotifier" filter="s60" name="Security Notifier">
 <unit bldFile="/mw/securitysrv/securitydialogs/securitynotifier/group"/>
 </component>
-<component id="lockclient" filter="s60" name="Lock Client" introduced="^3">
-<!-- This overwrites the bld.inf already in this dir. I'm pretty sure this will cause problems with the export -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/lockclient/group" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
+<component id="lockclient" filter="s60" name="Lock Client" introduced="^4">
+<unit bldFile="/mw/securitysrv/securitydialogs/lockclient/group" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
 <unit bldFile="/mw/securitysrv/securitydialogs/lockapp/group"/>
 </component>
 <component id="secuinotifications" name="Security UI Notifications" introduced="^4" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
-</component>
-<component id="indicatorautolockplugin" name="Auto Lock Indicator Plugin" introduced="^4" filter="s60" class="plugin">
-<!-- directory at the wrong level to be a component-->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/AutolockSrv/indicatorplugin" qt:proFile="indicatorautolockplugin.pro" qt:qmakeArgs="-r"/>
-</component>
-<component id="autolockuseractivityservice" name="Auto Lock User Activity Service" introduced="^4" filter="s60">
-<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/AutolockSrv" qt:proFile="autolockuseractivityservice.pro" qt:qmakeArgs="-r"/>
-</component>
-<component id="autolocksrv" name="Auto Lock Server" introduced="^4" filter="s60">
-<!-- directory at the wrong level to be a component-->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/securitydialogs/AutolockSrv" qt:proFile="AutolockSrv.pro" qt:qmakeArgs="-r"/>
-</component>
-</collection>
-<collection id="cpsecplugins" name="Security Settings Plugins" level="plugin">
-<component id="devicelockplugin" name="Device Lock Plugin" introduced="^4" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/cpsecplugins/devicelockplugin" qt:proFile="devicelockplugin.pro" qt:qmakeArgs="-r"/>
-</component>
-<component id="simpincodeplugin" name="SIM PIN Code Plugin" introduced="^4" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/cpsecplugins/simpincodeplugin" qt:proFile="pincodeplugin.pro" qt:qmakeArgs="-r"/>
-</component>
-<component id="cpadvancedsecplugin" name="Advanced Security Plugin" introduced="^4" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/securitysrv/cpsecplugins/cpadvancedsecplugin/group" qt:proFile="advancedsecplugin.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/securitysrv/securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
@@ -3245,6 +3231,9 @@
 <component id="drmencryptor" filter="s60" name="DRM Encryptor">
 <!-- this should have its own bld.inf or be removed as a component -->
 </component>
+<component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
+<!-- this should have its own bld.inf or be removed as a component -->
+</component>
 <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
 <unit bldFile="/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
 </component>
@@ -3303,12 +3292,6 @@
 <component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
 <unit bldFile="/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
 </component>
-<component id="supl_pos_message_plugin_api" name="SUPL POS Message Plugin API" class="api" filter="s60">
-<!-- placeholder
-    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
-	 -->
-</component>
 <component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
 <unit bldFile="/mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
 </component>
@@ -3364,9 +3347,6 @@
 <component id="locationsysui" filter="s60" name="Location System UI">
 <unit bldFile="/mw/locationsrv/locationsystemui/locationsysui/group"/>
 </component>
-<component id="locationsysui" filter="s60" name="Location System Qt UI">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/locationsrv/locationsystemui/locationsysui" qt:proFile="locsysui.pro"/>
-</component>
 </collection>
 <collection id="supl" name="SUPL" level="fw">
 <component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
@@ -3416,29 +3396,7 @@
 </component>
 </collection>
 </package>
-<package id="accesssec" level="generic" tech-domain="dc" name="Access Security" levels="plugin framework server generic specific">
-<collection id="accesssec_plat" name="Access Security Platform Interfaces" level="specific">
-<component id="eap_vpn_api" name="EAP VPN API" class="api" filter="s60">
-<unit bldFile="/mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-</component>
-<component id="eap_type_api" name="EAP Type API" class="api" filter="s60">
-<unit bldFile="/mw/accesssec/accesssec_plat/eap_type_api/group"/>
-</component>
-</collection>
-<collection id="securitysettings" name="WLAN Security Settings" level="specific">
-<component id="accesssec_qtconfigutils" filter="s60" name="Access Security Config Utils" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/accesssec/securitysettings/qtconfigutils" qt:proFile="qtconfigutils.pro" qt:qmakeArgs="-r"/>
-</component>
-<component id="cpwlansecurityuiplugins" filter="s60" name="Control Panel WLAN Security UI Plugins" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/accesssec/securitysettings/cpwlansecurityuiplugins" qt:proFile="cpwlansecurityuiplugins.pro" qt:qmakeArgs="-r"/>
-</component>
-</collection>
-<collection id="eapol" name="EAPOL" level="framework">
-<component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
-<unit bldFile="/mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-</component>
-</collection>
-</package>
+<package id="accesssec" level="generic" tech-domain="dc"/>
 <package id="ipconnmgmt" level="generic" tech-domain="dc" name="IP Connectivity Management" levels="plugin framework server utils api">
 <collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="api">
 <component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
@@ -3504,6 +3462,11 @@
 <unit bldFile="/mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
 </component>
 </collection>
+<collection id="accesspointcontrol" name="Access Point Control" level="plugin">
+<component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
+<unit bldFile="/mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
+</component>
+</collection>
 <collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
 <component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
 <unit bldFile="/mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
@@ -3557,9 +3520,10 @@
 </component>
 <component id="commsdatcreatorrfsplugin" filter="s60" name="Comms Database Creator RFS Plugin" class="plugin" introduced="9.3">
 <meta rel="config">
-<not-defined xmlns:qt="http://www.nokia.com/qt" condition="WINSCW"/>
+<not-defined condition="WINSCW"/>
 </meta>
-<unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
+<!-- uncomment when config is turned on -->
+<!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
 </component>
 <component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
 <unit bldFile="/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
@@ -3574,11 +3538,11 @@
 </collection>
 <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="api">
 <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
-<!-- need to move exports to another component, or make this a config component and revmove the #includes -->
+<!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
 <unit bldFile="/mw/ipconnmgmt/group"/>
 </component>
 <component id="ipcm_qt_build" name="IP Connectivity Management Qt Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/ipconnmgmt" qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/ipconnmgmt" qt:proFile="ipconnmgmt.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 </package>
@@ -3697,7 +3661,7 @@
 <unit bldFile="/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
 </component>
 <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
-<!--<unit bldFile="sipplugins/sippsipsettingsui/group"/> -->
+<unit bldFile="/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
 </component>
 <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
 <unit bldFile="/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
@@ -3766,7 +3730,7 @@
 <collection id="wlanutilities" name="WLAN Utilities" level="generic">
 <component id="wlanutilities_build" name="WLAN Utilities Qt" introduced="^4" filter="s60">
 <!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/wirelessacc/wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/wirelessacc/wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="wlanqtutilities" filter="s60" name="WLAN Qt Utilities" introduced="^4">
 <!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
@@ -3786,6 +3750,7 @@
 </collection>
 </package>
 <package id="vpnclient" level="specific" tech-domain="dc" name="VPN Client" levels="engine ui api">
+<!-- is the !oem_build filter needed? -->
 <collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
 <component id="vpnapi" filter="s60" class="api" name="VPN API">
 <unit bldFile="/mw/vpnclient/vpnc_plat/vpnapi/group"/>
@@ -3797,8 +3762,8 @@
 </component>
 </collection>
 <collection id="vpnengine" name="VPN Engine" level="engine">
-<!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
+<!-- too many components in this collection.
+    		Probably best to group the binaries together into larger components
     		or maybe split the collection into more reasonable groups  -->
 <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
 <unit bldFile="/mw/vpnclient/vpnengine/eventmediatorapi/group"/>
@@ -4130,7 +4095,7 @@
 </collection>
 <collection id="phonesrv_info" name="Phone Server Info" level="generic">
 <component id="phonesrv_build" name="Phone Server Build" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/phonesrv" qt:proFile="phonesrv.pro"/>
+<unit bldFile="/mw/phonesrv" qt:proFile="phonesrv.pro"/>
 </component>
 </collection>
 </package>
@@ -4298,7 +4263,7 @@
 <component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
 <unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
 </component>
-<component id="presence_avabilitytext" name="Presence Availability Text" class="api" filter="s60">
+<component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
 <unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
@@ -4380,6 +4345,12 @@
 <unit bldFile="/mw/legacypresence/xdmengine/group"/>
 </component>
 </collection>
+<collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
+<!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
+<component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
+<unit bldFile="/mw/legacypresence/xdmsettingsui/group"/>
+</component>
+</collection>
 <collection id="xdmprotocols" name="XDM Protocols" level="fw">
 <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
 <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
@@ -4392,6 +4363,12 @@
 <unit bldFile="/mw/legacypresence/msgconnmanager/group"/>
 </component>
 </collection>
+<collection id="presencesettingsui" name="Presence Settings UI" level="ui">
+<!-- collection is really a component. Need to move down a directory-->
+<component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
+<unit bldFile="/mw/legacypresence/presencesettingsui/group"/>
+</component>
+</collection>
 <collection id="simpleengine" name="SIMPLE Engine" level="engine">
 <!-- collection is really a component. Need to move down a directory-->
 <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
@@ -4461,7 +4438,7 @@
 </collection>
 <collection id="qcpix" name="Qt CPIX" level="engine">
 <component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/searchsrv/qcpix" qt:proFile="qcpix.pro"/>
+<unit bldFile="/mw/searchsrv/qcpix" qt:proFile="qcpix.pro"/>
 </component>
 </collection>
 <collection id="searchsrv_info" name="Search Services Info">
@@ -4548,6 +4525,21 @@
 <component id="pnpms_utils_api" name="PNPMS Utils API" class="api" filter="s60">
 <unit bldFile="/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
 </component>
+<component id="diagnostics_plugin_utility_api" name="Diagnostics Plugin Utility API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+</component>
+<component id="diagnostics_plugin_api" name="Diagnostics Plug-in API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
+</component>
+<component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
+</component>
+<component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
+</component>
+<component id="diagnostics_plugin_pool_api" name="Diagnostics Plugin Pool API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+</component>
 <component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
 <unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
 </component>
@@ -4631,6 +4623,23 @@
 <unit bldFile="/mw/remotemgmt/omaprovisioning/provisioning/group"/>
 </component>
 </collection>
+<collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
+<component id="diagframework" filter="s60" name="Diagnostics Framework">
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
+</component>
+<component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
+</component>
+<component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
+<!--  can only have one unit, merge or split into two components -->
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
+</component>
+<component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
+<!--  need to distribute exports, etc into the other components and remove this-->
+<unit bldFile="/mw/remotemgmt/devicediagnosticsfw/group"/>
+</component>
+</collection>
 <collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
 <component id="dcmoclient" filter="s60" name="DCMO Client">
 <unit bldFile="/mw/remotemgmt/dcmofw/dcmoclient/group"/>
@@ -4647,25 +4656,20 @@
 </component>
 </collection>
 <collection id="fotaapplication" name="FOTA Application" level="generic">
+<component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
+<!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
+<unit bldFile="/mw/remotemgmt/fotaapplication/group"/>
+</component>
 <component id="fotaserver" filter="s60" name="FOTA Server">
 <meta rel="config">
 <defined condition="__SYNCML_DM_FOTA"/>
 </meta>
-<unit bldFile="/mw/remotemgmt/fotaapplication/fotaserver/group"/>
+<!-- uncomment when #ifdefs are resolved -->
+<!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
 </component>
 <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
-<meta rel="config">
-<defined condition="__SYNCML_DM"/>
-<not-defined condition="__PLUG_AND_PLAY_MOBILE_SERVICES"/>
-</meta>
-<unit bldFile="/mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
-</component>
-<!-- really need to find a better way to do this -->
-<component id="fotacustcmds-alt" filter="s60" name="FOTA Custom Commands">
-<meta rel="config">
-<defined condition="__PLUG_AND_PLAY_MOBILE_SERVICES"/>
-</meta>
-<unit bldFile="/mw/remotemgmt/fotaapplication/fotaserver/fotacustcmds/group"/>
+<!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
+<!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
 </component>
 </collection>
 </package>
@@ -4840,31 +4844,31 @@
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<unit bldFile="/mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
+<!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
 </component>
 <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<unit bldFile="/mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
+<!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
 </component>
 <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<unit bldFile="/mw/dlnasrv/upnpframework/upnpcommonui/group"/>
+<!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
 </component>
 <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<unit bldFile="/mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
+<!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
 </component>
 <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<unit bldFile="/mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
+<!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
 </component>
 <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
 <unit bldFile="/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
@@ -4873,7 +4877,7 @@
 <unit bldFile="/mw/dlnasrv/upnpframework/upnpcommand/group"/>
 </component>
 <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
-<!-- move exports content into one or more of above components -->
+<!-- move exports content into one of above components -->
 <unit bldFile="/mw/dlnasrv/upnpframework/group"/>
 </component>
 </collection>
@@ -4885,24 +4889,21 @@
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<unit bldFile="/mw/dlnasrv/upnpsettings/multiselectionui/group"/>
+<!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
 </component>
 <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<unit bldFile="/mw/dlnasrv/upnpsettings/appwizard/group"/>
+<!--<unit bldFile="upnpsettings/appwizard/group"/>-->
 </component>
 <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
 <meta rel="config">
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
-<unit bldFile="/mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
+<!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
 </component>
 <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
-<meta rel="config">
-<defined condition="FF_UPNP_FRAMEWORK_2_0"/>
-</meta>
 <unit bldFile="/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
 </component>
 <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
@@ -4943,20 +4944,20 @@
 </meta>
 <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
 <!-- need to merge or #include these to a single bld.inf -->
-<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"/>
+<!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+        <unit bldFile="upnpharvester/common/cmsettings/group"/>
+        <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
+        <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
 </component>
 <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
-<unit bldFile="/mw/dlnasrv/upnpharvester/cdssync/common"/>
+<!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
 </component>
 <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
-<unit bldFile="/mw/dlnasrv/upnpharvester/mdhserver/group"/>
+<!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
 </component>
 <component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
 <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-<unit bldFile="/mw/dlnasrv/upnpharvester/group"/>
+<!--<unit bldFile="upnpharvester/group"/>-->
 </component>
 </collection>
 <collection id="homesync" name="Home Sync" level="plugin">
@@ -4964,7 +4965,7 @@
 <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
 </meta>
 <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
-<unit bldFile="/mw/dlnasrv/homesync/group"/>
+<!-- <unit bldFile="homesync/group"/>-->
 <!-- move bld.inf into contentmanager dir -->
 </component>
 </collection>
@@ -4974,10 +4975,14 @@
 </meta>
 <!-- collection is really just a component. Move down a directory -->
 <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
-<unit bldFile="/mw/dlnasrv/homemedia/group"/>
+<!-- <unit bldFile="homemedia/group"/> -->
 </component>
 </collection>
 <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
+<component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
+<!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
+<unit bldFile="/mw/dlnasrv/group"/>
+</component>
 
 </collection>
 </package>
@@ -5032,22 +5037,12 @@
 </component>
 </collection>
 <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
-<component id="btnotifclient" filter="s60" name="Bluetooth Notification Client" introduced="^4">
-<!-- cannot put a component under another component. Move up a directory -->
-<unit bldFile="/mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
-</component>
 <component id="bteng" filter="s60" name="Bluetooth Engine">
 <unit bldFile="/mw/btservices/bluetoothengine/bteng/group"/>
 </component>
-<component id="btserviceutil" filter="s60" name="Bluetooth Service Utils" introduced="^4">
-<unit bldFile="/mw/btservices/bluetoothengine/btserviceutil/group"/>
-</component>
 <component id="btnotif" filter="s60" name="Bluetooth Notifier">
 <unit bldFile="/mw/btservices/bluetoothengine/btnotif/group"/>
 </component>
-<component id="btdevicedialogplugin" filter="s60" name="Bluetooth Device Dialog Plugin" class="plugin" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/btservices/bluetoothengine/btnotif/btdevicedialogplugin" qt:proFile="btdevicedialogplugin.pro"/>
-</component>
 <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
 <unit bldFile="/mw/btservices/bluetoothengine/btaudioman/group"/>
 </component>
@@ -5064,7 +5059,7 @@
 <unit bldFile="/mw/btservices/bluetoothengine/btsap/group"/>
 </component>
 <component id="btui" filter="s60" name="Bluetooth UI">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/btservices/bluetoothengine/btui" qt:proFile="btui.pro"/>
+<unit bldFile="/mw/btservices/bluetoothengine/btui/group"/>
 </component>
 <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
 <unit bldFile="/mw/btservices/bluetoothengine/btpbap/group"/>
@@ -5075,6 +5070,12 @@
 <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
 <unit bldFile="/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
 </component>
+<component id="btserviceutil" filter="s60" name="Bluetooth Service Utils">
+<unit bldFile="/mw/btservices/bluetoothengine/btserviceutil/group"/>
+</component>
+<component id="btnotifclient" filter="s60" name="Bluetooth Notifier Client">
+<unit bldFile="/mw/btservices/bluetoothengine/btnotif/btnotifclient/group"/>
+</component>
 </collection>
 <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
 <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
@@ -5161,15 +5162,15 @@
 <component id="usbmscpersonality" filter="s60" name="USB MSC Personality" class="plugin">
 <unit bldFile="/mw/usbservices/usbclasses/usbmscpersonality/group"/>
 </component>
-<!--	commented out in bld.inf. Should this be deleted?     
-  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
-        <unit bldFile="usbclasses/ptpstack/group"/>
-      </component>
-      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
-        <unit bldFile="usbclasses/sicdusbplugin/group"/>
-      </component>
-      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
-        <unit bldFile="usbclasses/ptpserver/group"/>
+<!--	commented out in bld.inf. Should this be deleted?     
+  <component id="ptpstack" filter="s60" name="Picture Transfer Protocol Stack">
+        <unit bldFile="usbclasses/ptpstack/group"/>
+      </component>
+      <component id="sicdusbplugin" filter="s60" name="SICD USB Plugin" class="plugin">
+        <unit bldFile="usbclasses/sicdusbplugin/group"/>
+      </component>
+      <component id="ptpserver" filter="s60" name="Picture Transfer Protocol Server">
+        <unit bldFile="usbclasses/ptpserver/group"/>
       </component>-->
 <component id="pictbridgeengine" filter="s60" name="PictBridge Engine">
 <unit bldFile="/mw/usbservices/usbclasses/pictbridgeengine/group"/>
@@ -5179,6 +5180,9 @@
 </component>
 </collection>
 <collection id="usbuis" name="USB UIs" level="specific">
+<component id="usbui" filter="s60" name="USB UI">
+<unit bldFile="/mw/usbservices/usbuis/usbui/group"/>
+</component>
 <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
 <unit bldFile="/mw/usbservices/usbuis/usbuinotif/group"/>
 </component>
@@ -5188,11 +5192,8 @@
 <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
 <unit bldFile="/mw/usbservices/usbuis/imageprintui/group"/>
 </component>
-<component id="usbsettingsapp" name="USB Settings Application" introduced="^4" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/usbservices/usbuis/usbsettingsapp" qt:proFile="usbsettingsapp.pro" qt:qmakeArgs="-r"/>
-</component>
-<component id="usbindicatorplugin" name="USB Indicator Plugin" introduced="^4" filter="s60" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/usbservices/usbuis/usbindicatorplugin" qt:proFile="usbindicatorplugin.pro" qt:qmakeArgs="-r"/>
+<component id="usbuiqt" name="USB UI Qt" introduced="^4" filter="s60">
+<unit bldFile="/mw/usbservices/usbuis/usbuiqt" qt:proFile="usbapplication.pro"/>
 </component>
 </collection>
 <collection id="usbservices_test" name="USB Services Test" level="server">
@@ -5237,10 +5238,6 @@
 <component id="obexsendservices" name="OBEX Send Services">
 <unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
 </component>
-<component id="obexhighway" name="OBEX Highway" introduced="^4">
-<!-- component must be moved to its own directory. Components cannot live in others component's directories -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/shortlinkconn/localconnectivityservice/obexsendservices/obexhighway" qt:proFile="obexhighway.pro"/>
-</component>
 <component id="obexreceiveservices" name="OBEX Receive Services">
 <unit bldFile="/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
 </component>
@@ -5280,7 +5277,7 @@
 <unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
 </component>
 <component id="thumbnailmanagerqt" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
+<unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
 
 </component>
 </collection>
@@ -5430,7 +5427,8 @@
 <defined condition="RD_MDS_2_5"/>
 </meta>
 <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
-<unit bldFile="/mw/mds/clfwrapper/group"/>
+<!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
+<!--<unit bldFile="clfwrapper/group"/>-->
 </component>
 </collection>
 <collection id="mds_info" name="Metadata Services Info" level="int">
@@ -5464,6 +5462,12 @@
 <component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
 <unit bldFile="/mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
 </component>
+<component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+</component>
+<component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+</component>
 <component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
 <unit bldFile="/mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
 </component>
@@ -5479,6 +5483,9 @@
 <component id="audio_metadata_reader_api" name="Audio MetaData Reader API" class="api" filter="s60">
 <unit bldFile="/mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
 </component>
+<component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+</component>
 <component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
 <unit bldFile="/mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
 </component>
@@ -5528,18 +5535,10 @@
 <component id="openmax_al_api" name="OpenMAX AL API" class="api" filter="s60" introduced="^4">
 <unit bldFile="/mw/mmmw/mmmw_plat/openmax_al_api/group"/>
 </component>
-<component id="openmax_al_ext_api" name="OpenMAX AL Extensions API" class="api" filter="s60" introduced="^4">
-<unit bldFile="/mw/mmmw/mmmw_plat/openmax_al_ext_api/group"/>
-</component>
 <component id="system_tone_service_api" name="System Tone Service API" class="api" filter="s60" introduced="^4">
 <unit bldFile="/mw/mmmw/mmmw_plat/system_tone_service_api/group"/>
 </component>
 </collection>
-<collection id="khronosfws" name="Khronos Frameworks" level="framework">
-<component id="openmax_al" filter="s60" name="OpenMAX AL" introduced="^4">
-<unit bldFile="/mw/mmmw/khronosfws/openmax_al/group"/>
-</component>
-</collection>
 <collection id="mmfenh" name="MMF Enhancements" level="generic">
 <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
 <unit bldFile="/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
@@ -5559,9 +5558,19 @@
 <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
 <unit bldFile="/mw/mmmw/mmfenh/profilesettingsmonitor/group"/>
 </component>
-
+<component id="progressivedownload" filter="s60" name="Progressive Download">
+<unit bldFile="/mw/mmmw/mmfenh/progressivedownload/group"/>
+</component>
+
+</collection>
+<collection id="mm_fw" name="Multimedia Frameworks" level="framework">
+<!-- Id needs to be unique, mmfw already in use -->
+<!-- Placeholder for OpenAX AL and other stuff -->
 </collection>
 <collection id="mmserv" name="Multimedia Services" level="specific">
+<component id="audioeffectsui" filter="s60" name="Audio Effects UI">
+<unit bldFile="/mw/mmmw/mmserv/audioeffectsui/group"/>
+</component>
 <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
 <unit bldFile="/mw/mmmw/mmserv/callaudiocontrol/group"/>
 </component>
@@ -5614,8 +5623,7 @@
 </component>
 <component id="gst_plugins_symbian" filter="s60" name="GStreamer Sybmian Plugins" introduced="^3">
 <!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
-
-<!-- add ,pref_test,TA_GSTREAMER filters later -->
+<!--<unit bldFile="gst_plugins_symbian/tsrc/GStreamerTestModule/group" filter="test,pref_test"/>-->
 </component>
 </collection>
 <collection id="gstregistrygenerator" name="GStreamer Registry Generator" level="core">
@@ -5737,13 +5745,13 @@
 </component>
 <component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
 <meta rel="config">
-<defined xmlns:qt="http://www.nokia.com/qt" condition="IAD_INCLUDE_BACKSTEPPING"/>
+<defined condition="IAD_INCLUDE_BACKSTEPPING"/>
 </meta>
 <unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
 </component>
 <component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
 <meta rel="config">
-<defined xmlns:qt="http://www.nokia.com/qt" condition="__WINDOWS_MEDIA"/>
+<defined condition="__WINDOWS_MEDIA"/>
 </meta>
 <unit bldFile="/mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
 </component>
@@ -5753,9 +5761,6 @@
 <component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
 <unit bldFile="/mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
 </component>
-<component id="qt_telephony_multimedia_service_api" name="Qt Telephony Multimedia Service API" introduced="^4" class="api" filter="s60">
-<unit bldFile="/mw/mmappfw/mmappfw_plat/qt_telephony_multimedia_service_api/group"/>
-</component>
 </collection>
 <collection id="mpx" name="Multimedia Player" level="fw">
 <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
@@ -5770,8 +5775,8 @@
 <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
 <unit bldFile="/mw/mmappfw/mpx/viewframework/group"/>
 </component>
-<component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/mmappfw/mpx/mpxviewframeworkqt" qt:proFile="mpxviewframeworkqt.pro" qt:qmakeArgs="-r -config rom"/>
+<component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introducde="^4">
+<unit bldFile="/mw/mmappfw/mpx/mpxviewframeworkqt" qt:proFile="mpxviewframeworkqt.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
 <!--  Move the export to another component or remove the #includes from this one -->
@@ -5780,7 +5785,7 @@
 </collection>
 <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
 <component id="mmappcomponents_build" filter="s60" name="Multimedia App Components Build" introduced="^1">
-<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+<!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
 <unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
 </component>
@@ -5801,15 +5806,17 @@
 </component>
 <component id="audiofetcher" filter="s60" name="Audio Fetcher" class="plugin" introduced="^1">
 <meta rel="config">
-<defined xmlns:qt="http://www.nokia.com/qt" condition="IAD_INCLUDE_AUDIOFETCHER"/>
+<defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
 </meta>
-<unit bldFile="/mw/mmappfw/mmappcomponents/audiofetcher/group"/>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
 </component>
 <component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
 <meta rel="config">
-<defined xmlns:qt="http://www.nokia.com/qt" condition="__WINDOWS_MEDIA"/>
+<defined condition="__WINDOWS_MEDIA"/>
 </meta>
-<unit bldFile="/mw/mmappfw/mmappcomponents/asxparser/group"/>
+<!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
+<!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
 </component>
 <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
 <unit bldFile="/mw/mmappfw/mmappcomponents/playbackhelper/group"/>
@@ -5821,12 +5828,6 @@
 <unit bldFile="/mw/mmappfw/mmappcomponents/mmmtpdataprovider/group"/>
 </component>
 </collection>
-<collection id="qtms" name="Qt Telephony Multimedia Services" level="fw">
-<component id="qtms_build" filter="s60" name="Qt Telephony Multimedia Services Build" introduced="^4">
-<!--  Collection is really a component. Move down a dir -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/mmappfw/qtms" qt:proFile="qtmsapi.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-</collection>
 <collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
 <component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
 <!--  Move the export to another component or remove the #includes from this one -->
@@ -5837,29 +5838,22 @@
 </component>
 </collection>
 </package>
-<package id="hgwidgets" level="specific" tech-domain="mm" name="Multimedia Widgets" levels="framework service api">
-<collection id="hgwidgets_plat" name="Multimedia Widgets Platform Interfaces" level="api">
+<package id="hgwidgets" level="specific" tech-domain="mm" name="HG Widgets" levels="framework service api">
+<collection id="hgwidgets_plat" name="HG Widgets Platform Interfaces" level="api">
 <component id="ganeswidgets_api" name="Ganes Widgets API" class="api" introduced="^4">
 <!-- should separate out unit -->
 </component>
-<component id="hgcacheproxymodel_api" name="Hg Cache Proxy Model API" class="api" introduced="^4">
-<!-- should separate out unit -->
-</component>
-<component id="hgwidgets_plat_build" name="Multimedia Widgets Platform Interfaces Build" class="api" introduced="^4">
-<!-- break this up into separate components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hgwidgets/hgwidgets_plat" qt:proFile="hgwidgets_plat.pro"/>
-</component>
-</collection>
+</collection>
+<collection id="hgwidgets_pub" name="HG Widgets Public Interfaces" level="api"/>
 <collection id="ganeswidgets" name="Ganes Widgets" level="service">
 <!-- really a component, should move down a dir level and have a unit -->
 <component id="ganeswidgets_build" name="Ganes Widgets Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hgwidgets/ganeswidgets" qt:proFile="ganeswidgets.pro"/>
-</component>
-</collection>
-<collection id="hgcacheproxymodel" name="Hurriganes Cache Proxy Model" level="framework">
-<!-- really a component, should move down a dir level and have a unit -->
-<component id="hgcacheproxymodel_build" name="Hurriganes Cache Proxy Model Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hgwidgets/hgcacheproxymodel" qt:proFile="hgcacheproxymodel.pro"/>
+<!-- should separate out unit -->
+</component>
+</collection>
+<collection id="hgwidgets_info" name="HG Widgets Info" level="framework">
+<component id="hgwidgets_build" name="HG Widgets Build" introduced="^4">
+<unit bldFile="/mw/hgwidgets" qt:proFile="hgwidgets.pro"/>
 </component>
 </collection>
 </package>
@@ -5918,7 +5912,8 @@
 <meta rel="config">
 <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
 </meta>
-<unit bldFile="/mw/inputmethods/textinput/ptienginev2/group"/>
+<!--uncomment when configuration is turned on and textinput_build is removed-->
+<!--  <unit bldFile="textinput/ptienginev2/group"/>-->
 </component>
 <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
 <unit bldFile="/mw/inputmethods/textinput/akninputlanguage/group"/>
@@ -5926,6 +5921,19 @@
 <component id="peninputarc" filter="s60" name="Pen Input Arc">
 <unit bldFile="/mw/inputmethods/textinput/peninputarc/group"/>
 </component>
+<component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
+<unit bldFile="/mw/inputmethods/textinput/peninputcommonctrls/group"/>
+</component>
+<component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
+<unit bldFile="/mw/inputmethods/textinput/peninputcommonlayout/group"/>
+</component>
+<component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
+<unit bldFile="/mw/inputmethods/textinput/peninputhwrtrui/group"/>
+</component>
+<component id="textinput_build" filter="s60" name="Text Input Build">
+<!--needed for #ifdef, can be removed when configuration is implemented -->
+<unit bldFile="/mw/inputmethods/textinput/group"/>
+</component>
 </collection>
 <collection id="fep" name="FEP" level="engine">
 <component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
@@ -5950,14 +5958,18 @@
 </collection>
 <collection id="qt_info" name="Qt Info" level="mw">
 <component id="qt_build" name="Qt Build" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+<unit bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r -config sgimagelite_support"/>
 </component>
 </collection>
 <collection id="qtdemos" name="Qt Demos" level="app">
-
+<component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
+<unit bldFile="/mw/qt/demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
+</component>
 </collection>
 <collection id="qtexamples" name="Qt Examples" level="app">
-
+<component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="qtexamples">
+<unit bldFile="/mw/qt/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+</component>
 </collection>
 <collection id="qt_tests" name="Qt Tests" level="app">
 
@@ -5967,50 +5979,50 @@
 <package id="qtextensions" level="generic" tech-domain="ui" name="Qt Extensions" levels="tool mw app">
 <collection id="qtecomplugins" name="Qt ECom Plugins" level="app">
 <component id="qtecomplugins_build" filter="qtecomplugins" name="Qt ECom Plugin" purpose="development" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qtextensions/qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="qtextensions_examples" filter="qtextensionsexamples" name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qtextensions/qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="qthighway" name="Qt Highway" level="app">
 <component id="qthighway_build" filter="qthighway" name="Qt Highway" purpose="development" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qtextensions/qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="qthighway_examples" filter="qtextensionsexamples" name="Qt Highway Examples" purpose="development" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qtextensions/qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
 </component>
 
 </collection>
 <collection id="qtmobileextensions" name="Qt Mobile Extensions" level="app">
 <component id="qtmobileextensions_build" filter="qtextension" name="Qt Mobile Extensions" purpose="development" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qtextensions/qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="qtmobileextensions_examples" filter="qtextensionsexamples" name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qtextensions/qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="qtmobility" name="Qt Mobility" level="mw">
 <component id="qtmobility_build" filter="qtmobility" name="Qt Mobility" purpose="development" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qtextensions/qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="qtmobility_examples" filter="qtextensionsexamples" name="Qt Mobility Examples" purpose="development" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qtextensions/qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
 </component>
 
 </collection>
 <collection id="qhbstyle" level="mw" name="Qt Orbit Style">
 <component id="qhbstyle_build" name="Qt Orbit Style Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions/qhbstyle" qt:qmakeArgs="-r" qt:proFile="qhbstyle.pro"/>
+<unit bldFile="/mw/qtextensions/qhbstyle" qt:qmakeArgs="-r" qt:proFile="qhbstyle.pro"/>
 </component>
 </collection>
 <collection id="qtextensions_info" name="Qt Extensions Info" level="app">
-<component id="qtextensions_conf" name="Qt Extensions Confgure" class="config" introduced="^4" filter="qt_tools">
+<component id="qtextensions_conf" name="Qt Extensions Confgure" class="conf" introduced="^4" filter="qt_tools">
 <unit bldFile="/mw/qtextensions/group"/>
 </component>
 <component id="qtextensions_build" name="Qt Extensions Build" introduced="^4">
 <!-- break this up into the above collections-->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qtextensions" qt:proFile="qtextensions.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qtextensions" qt:proFile="qtextensions.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 </package>
@@ -6018,12 +6030,15 @@
 <collection id="hb_info" name="Orbit Info" level="api">
 <component id="hb_build" name="Orbit Build" introduced="^4">
 <!-- should break this down into actual components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/hb" qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
+<unit bldFile="/mw/hb" qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
 </component>
 </collection>
 </package>
 <package id="classicui" level="generic" tech-domain="ui" name="Classic UI" levels="base support server generic specific">
 <collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
+<component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_framework_api/group"/>
+</component>
 <component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
 
@@ -6048,10 +6063,16 @@
 <unit bldFile="/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
 
 </component>
+<component id="personalisation_plugin_api" name="Personalisation Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
+</component>
 <component id="extended_aiw_criteria_api" name="Extended AIW Criteria API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
 
 </component>
+<component id="personalisation_application_api" name="Personalisation Application API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_application_api/group"/>
+</component>
 <component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
 
@@ -6092,6 +6113,9 @@
 <unit bldFile="/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
 
 </component>
+<component id="personalisation_slide_show_dialog_api" name="Personalisation Slide Show Dialog API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
+</component>
 <component id="key_event_utilities_api" name="Key Event Utilities API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/key_event_utilities_api/group"/>
 </component>
@@ -6151,6 +6175,9 @@
 <component id="fep_document_navigation_api" name="FEP Document Navigation API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
 </component>
+<component id="personalisation_localised_texts_api" name="Personalisation Localised Texts API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
+</component>
 <component id="memory_card_ui_api" name="Memory Card UI API" class="api" filter="s60">
 <unit bldFile="/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
 
@@ -6328,12 +6355,6 @@
 <unit bldFile="/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
 
 </component>
-<component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
-<unit bldFile="/mw/classicui/classicui_plat/directory_localizer_api/group"/>
-</component>
-<component id="findutil_api" class="api" name="Find Util API" filter="s60">
-<unit bldFile="/mw/classicui/classicui_plat/findutil_api/group"/>
-</component>
 </collection>
 <collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
 <component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
@@ -6617,6 +6638,12 @@
 <unit bldFile="/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
 </component>
 </collection>
+<collection id="psln" name="Personalization" level="specific">
+<!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
+<component id="psln_build" filter="s60" name="Personalization Build">
+<unit bldFile="/mw/classicui/psln/group"/>
+</component>
+</collection>
 <collection id="commonadapter" name="Common Adapter" level="support">
 <!-- the collection is really a component. Move down a directory.-->
 <component id="commonadapter_build" filter="s60" name="Common Adapter Build">
@@ -6886,10 +6913,10 @@
 <component id="fontprovider" filter="s60" name="Font Provider">
 <unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
 </component>
-<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
 <component id="fontutils" filter="sf_build" name="Font Utils">
 <unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -6952,7 +6979,7 @@
 <collection id="platformthemes_info" name="Platform Themes Info">
 <component id="platformthemes_build" name="Platform Themes Build">
 <!-- no real structure in this package. Should break into collections / components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/platformthemes" qt:proFile="platformthemes.pro"/>
+<unit bldFile="/mw/platformthemes" qt:proFile="platformthemes.pro"/>
 </component>
 </collection>
 </package>
@@ -6967,37 +6994,47 @@
 </collection>
 <collection id="gsprofilesrv_plat" name="GS and Profiles Services Platform Interfaces" level="specific">
 <component id="ftuwizardmodel_api" name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" qt:proFile="ftuwizardmodel_api.pro" qt:qmakeArgs="-r -config rom"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" qt:proFile="ftuwizardmodel_api.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 <component id="profiles_engine_api" name="Profiles Engine API" class="api" filter="s60">
 <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
 </component>
+<component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+</component>
+<component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
+</component>
+<component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
+</component>
+<component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
+</component>
+<component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
+</component>
 <component id="settings_uis_cenrep_collection_api" name="Settings UIs CenRep Collection API" class="api" filter="s60">
 <unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
 </component>
 </collection>
+<collection id="gssettingsuis" name="General Settings UIs" level="framework">
+<component id="gs" filter="s60" name="General Settings" introduced="9.2">
+<unit bldFile="/mw/gsprofilesrv/gssettingsuis/gs/group"/>
+</component>
+</collection>
 <collection id="ftuwizardmodel" name="FTU Wizard Model" level="generic">
 <component id="ftuwizardmodel_build" name="FTU Wizardmodel Build" filter="bldfirst">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/gsprofilesrv/ftuwizardmodel" qt:proFile="ftuwizardmodel.pro" qt:qmakeArgs="-r -config rom"/>
+<unit bldFile="/mw/gsprofilesrv/ftuwizardmodel" qt:proFile="ftuwizardmodel.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 <collection id="controlpanel" name="Control Panel" level="generic">
 
 <component id="controlpanel_rom" name="Control Panel ROM" filter="s60">
-<!-- Need to create a real .pro file for this 
-	  <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component id="controlpanel_config" name="Control Panel Config" filter="s60" class="config" introduced="^4">
-<!-- Need to create a real .pro file for this 
-	  <unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
+<unit bldFile="/mw/gsprofilesrv/controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/>
 </component>
 <component id="controlpanel_source" name="Control Panel Source" filter="s60">
-<!-- Uncomment when controlpanel_build is removed
-	  <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
-</component>
-<component id="controlpanel_build" name="Control Panel Build" filter="s60">
-<!-- need to make included .pri file into a real .pro file -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/gsprofilesrv/controlpanel" qt:qmakeArgs="-r -config rom" qt:proFile="controlpanel.pro"/>
+<unit bldFile="/mw/gsprofilesrv/controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/>
 </component>
 </collection>
 <collection id="profilesservices" name="Profiles Services" level="server">
@@ -7009,37 +7046,46 @@
 <package id="homescreensrv" level="specific" tech-domain="ui" name="Home Screen Services" levels="plugin framework server generic specific">
 <collection id="appfoundation" name="App Foundation" level="generic">
 <component id="appfoundation_build" name="App Foundation Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
+<unit bldFile="/mw/homescreensrv/appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
 </component>
 </collection>
 <collection id="hswidgetmodel" name="Home Screen Widget Model" level="framework">
 <component id="hswidgetmodel_build" name="Home Screen Widget Model Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
+<unit bldFile="/mw/homescreensrv/hswidgetmodel" qt:qmakeArgs="-r" qt:proFile="hswidgetmodel.pro"/>
 </component>
 </collection>
 <collection id="contentstorage" name="Content Storage" level="framework">
 <component id="cautils" name="Content Arsenal Utils" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
+<unit bldFile="/mw/homescreensrv/contentstorage/cautils" qt:qmakeArgs="-r" qt:proFile="cautils.pro"/>
 </component>
 <component id="contentstorage_build" name="Content Storage Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
+<unit bldFile="/mw/homescreensrv/contentstorage/group" qt:qmakeArgs="-r" qt:proFile="group.pro"/>
 </component>
 <component id="casrv/calocalizerscanner" name="Content Arsenal Server Localizer Scanner" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
+<unit bldFile="/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qt:qmakeArgs="-r" qt:proFile="calocalizerscanner.pro"/>
 </component>
 <component id="cahandler" name="Content Arsenal Handler" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
+<unit bldFile="/mw/homescreensrv/contentstorage/cahandler" qt:qmakeArgs="-r" qt:proFile="cahandler.pro"/>
 </component>
 <component id="caclient" name="Content Arsenal Client" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
-</component>
-<component id="casoftwareregistry" name="Content Arsenal Software Registry" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/contentstorage/casoftwareregistry" qt:qmakeArgs="-r" qt:proFile="casoftwareregistry.pro"/>
+<unit bldFile="/mw/homescreensrv/contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
 </component>
 </collection>
 <collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
 <component id="homescreensrv_plat_build" name="Home Screen Services Platform Interfaces build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
+</component>
+<component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api"/>
+</component>
+<component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api"/>
+</component>
+<component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing"/>
+</component>
+<component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
+<unit base="/mw/homescreensrv/homescreensrv_plat/sapi_actionhandler"/>
 </component>
 <component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
 <unit base="/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api"/>
@@ -7060,25 +7106,19 @@
 <unit base="/mw/homescreensrv/homescreensrv_plat/homescreen_information_api"/>
 </component>
 </collection>
-<collection id="hsactivityfw" name="Activity Framework" level="fw">
+<collection id="hsactivityfw" name="Activity Framework" level="activityfw">
 <component id="hsactivityfw_build" name="Activity Framework Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
-</component>
-</collection>
-<collection id="tstaskmonitor" name="Task Switcher Task Monitor" level="fw">
-<!-- move collection down to a component directory or split up into component .pro files -->
-<component id="tstaskmonitor_build" name="Task Switcher Task Monitor Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/tstaskmonitor" qt:qmakeArgs="-r" qt:proFile="tstaskmonitor.pro"/>
+<unit bldFile="/mw/homescreensrv/activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
 </component>
 </collection>
 <collection id="hsappkeyhandler" name="HS Appplication Key Handler" level="server">
 <component id="hsappkeyhandler_build" name="Appplication Key Handler Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv/hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
+<unit bldFile="/mw/homescreensrv/hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
 </component>
 </collection>
 <collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
 <component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrv" qt:qmakeArgs="-r" qt:proFile="homescreensrv_exports_to_rom.pri"/>
+<unit bldFile="/mw/homescreensrv" qt:qmakeArgs="-r" qt:proFile="homescreensrv.pro"/>
 </component>
 <component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
 <unit bldFile="/mw/homescreensrv/group"/>
@@ -7089,13 +7129,10 @@
 <package id="homescreensrvlegacy" level="generic" tech-domain="ui" name="Legacy Home Screen Services" levels="plugin framework server generic specific">
 <collection id="homescreensrvlegacy_plat" name="Legacy Home Screen Services Platform Interfaces" level="specific">
 <component id="ai_content_model_api" name="AI Content Model API" class="api" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrvlegacy/ai_content_model_api/group" qt:proFile="group.pro"/>
+<unit bldFile="/mw/homescreensrvlegacy/ai_content_model_api/group" qt:proFile="group.pro"/>
 </component>
 <component id="ai_plugin_information_api" name="AI Plug-in Information API" class="api" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/homescreensrvlegacy/ai_plugin_information_api/group" qt:proFile="group.pro"/>
-</component>
-<component id="content_harvester_plugin_api" name="Content Harvester Plugin API " class="api" filter="s60">
-<unit bldFile="/mw/homescreensrvlegacy/content_harvester_plugin_api/group"/>
+<unit bldFile="/mw/homescreensrvlegacy/ai_plugin_information_api/group" qt:proFile="group.pro"/>
 </component>
 </collection>
 </package>
@@ -7125,6 +7162,9 @@
 <component id="sw_installer_ps_keys" name="SW Installer PS Keys" class="api" filter="s60">
 <unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
 </component>
+<component id="appmngr2runtimeapi" name="Application Manager 2 Runtime Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+</component>
 <component id="sifui_api" name="STIF UI API" class="api" filter="s60">
 <unit bldFile="/mw/appinstall/appinstall_plat/sifui_api/group"/>
 </component>
@@ -7135,7 +7175,13 @@
 </component>
 </collection>
 <collection id="ncdengine" name="Nokia Content Discover" level="framework">
-<!-- collection is really just a component. Move down one diretcory -->
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
+<unit bldFile="/mw/appinstall/ncdengine/engine/group"/>
+</component>
+<component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
+<!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+</component>
 <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
 <unit bldFile="/mw/appinstall/ncdengine/group"/>
 </component>
@@ -7144,9 +7190,6 @@
 <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
 <unit bldFile="/mw/appinstall/appinstaller/appinstui/group"/>
 </component>
-<component id="appinstui_qt" filter="s60" name="Application Installer Qt UI" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/appinstall/appinstaller/appinstui" qt:proFile="appinstui.pro" qt:qmakeArgs="-r"/>
-</component>
 </collection>
 <collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
 <!-- the collection is really a component. Move down a directory.-->
@@ -7155,9 +7198,12 @@
 </component>
 </collection>
 <collection id="iaupdate" name="Independent Apps Update" level="api">
-<!-- Should reorganise into actual components -->
-<component id="iad" name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/appinstall/iaupdate" qt:proFile="iaupdate.pro" qt:qmakeArgs="-r"/>
+<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+<component id="iad" name="Software Update" filter="s60" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/iad/group"/>
+</component>
+<component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
+<unit bldFile="/mw/appinstall/iaupdate/help/group"/>
 </component>
 <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
 <unit bldFile="/mw/appinstall/iaupdate/group"/>
@@ -7206,6 +7252,7 @@
 </collection>
 <collection id="appinstall_info" name="Application Installation Info" level="api">
 
+
 <component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
 </component>
@@ -7266,9 +7313,8 @@
 <package id="serviceapi" level="specific" tech-domain="rt" name="Service API" levels="os mw1 mw2 app">
 <!-- should break up this collection into something meaningful -->
 <collection id="serviceproviders" name="Service Providers" level="mw1">
-<!-- are commented out components to be removed? -->
 <component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI" filter="s60" class="plugin">
-<!--<unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>-->
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
 </component>
 <component id="sapi_location" name="Location SAPI" filter="s60" class="plugin">
 <unit bldFile="/mw/serviceapi/serviceproviders/sapi_location/group"/>
@@ -7280,13 +7326,13 @@
 <unit bldFile="/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
 </component>
 <component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
-<!-- <unit bldFile="serviceproviders/sapi_messaging/group"/> -->
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
 </component>
 <component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
-<!--  <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>-->
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
 </component>
 <component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
-<!-- <unit bldFile="serviceproviders/sapi_calendar/group"/> -->
+<unit bldFile="/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
 </component>
 <component id="sapi_logging" name="Logging SAPI" filter="s60" class="plugin">
 <unit bldFile="/mw/serviceapi/serviceproviders/sapi_logging/group"/>
@@ -7312,7 +7358,7 @@
 <package id="browser" level="specific" tech-domain="rt" name="Browser" levels="plugin utils support main">
 <collection id="bookmarksengine" name="Bookmarks Engine" level="support">
 <component id="bookmarksengine_build" name="Bookmarks Engine Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/browser/bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
+<unit bldFile="/mw/browser/bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
 </component>
 </collection>
 </package>
@@ -7393,6 +7439,12 @@
 <unit bldFile="/mw/web/web_plat/xml_parser_api/group"/>
 </component>
 </collection>
+<collection id="web_info" name="Web Info" level="specific">
+<component id="web_build" filter="s60" name="Web Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="/mw/web/group"/>
+</component>
+</collection>
 <collection id="browserutilities" name="Browser Utilities" level="utils">
 <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
 <unit bldFile="/mw/web/browserutilities/browserdialogsprovider/group"/>
@@ -7425,7 +7477,8 @@
 <meta rel="config">
 <defined condition="BRDO_MULTIPART_PARSER_FF"/>
 </meta>
-<unit bldFile="/mw/web/browserutilities/multipartparser/group"/>
+<!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+<!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
 </component>
 <component id="schemehandler" filter="s60" name="Scheme Handler">
 <unit bldFile="/mw/web/browserutilities/schemehandler/group"/>
@@ -7436,6 +7489,10 @@
 <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
 <unit bldFile="/mw/web/browserutilities/aiwbrowserprovider/group"/>
 </component>
+<component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+<unit bldFile="/mw/web/browserutilities/group"/>
+</component>
 </collection>
 <collection id="webengine" name="Web Engine" level="server">
 <component id="osswebengine" filter="s60" name="OSS Web Engine">
@@ -7510,7 +7567,7 @@
 <unit bldFile="/mw/web/codhandler/roapapp/group"/>
 </component>
 <component id="codhandler_build" filter="s60" name="COD Handler Build">
-<!-- Exports need to go into another component or make this self-contained.
+<!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
 <unit bldFile="/mw/web/codhandler/group"/>
 </component>
@@ -7520,29 +7577,35 @@
 <defined condition="RD_BROWSER_WIDGETS"/>
 <defined condition="__WEB_WIDGETS"/>
 </meta>
+<!-- the following units can be uncommented when configuration is put in place -->
 <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
-<unit bldFile="/mw/web/widgets/widgetrecognizer/group"/>
+<!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
 </component>
 <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
-<unit bldFile="/mw/web/widgets/widgetinstaller/group"/>
+<!--<unit bldFile="widgets/widgetinstaller/group"/>-->
 </component>
 <component id="widgetlauncher" filter="s60" name="Widget Launcher">
-<unit bldFile="/mw/web/widgets/widgetlauncher/group"/>
+<!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
 </component>
 <component id="widgetapp" filter="s60" name="Widget UI">
-<unit bldFile="/mw/web/widgets/widgetapp/group"/>
+<!--<unit bldFile="widgets/widgetapp/group"/>-->
 </component>
 <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
 <meta rel="config">
 <defined condition="RD_WIDGET_PREINSTALLER"/>
 </meta>
-<unit bldFile="/mw/web/widgets/widgetpreinstaller/group"/>
+<!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
 </component>
 <component id="widgetstartup" filter="s60" name="Widget Startup">
 <meta rel="config">
 <defined condition="RD_WIDGET_PREINSTALLER"/>
 </meta>
-<unit bldFile="/mw/web/widgets/widgetstartup/group"/>
+<!--<unit bldFile="widgets/widgetstartup/group"/>-->
+</component>
+<component id="widgets_build" filter="s60" name="Widgets Build">
+<!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+      		#included .hrh file needs to be #included in each of the other components -->
+<unit bldFile="/mw/web/widgets/group"/>
 </component>
 </collection>
 </package>
@@ -7666,17 +7729,17 @@
 </collection>
 </package>
 <package id="webruntime" level="specific" tech-domain="rt" name="Web Runtime">
-<!-- need to break up this package into collections and components -->
+<!-- need to break up this package nito collections and components -->
 <collection id="webruntime_info" name="Web Runtime Info">
 <component id="webruntime_build" name="Web Runtime Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/webruntime" qt:proFile="cwrt.pro" qt:qmakeArgs="&quot;what+=qtsfw&quot; &quot;what+=qt_unstable&quot; &quot;what+=tenone&quot; &quot;what+=usif&quot; &quot;what+=services&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
+<unit bldFile="/mw/webruntime" qt:proFile="cwrt.pro" qt:qmakeArgs="&quot;what+=ninetwo&quot; &quot;what+=tenone&quot; &quot;what+=qt_unstable&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
 </component>
 </collection>
 </package>
 <package id="platformtools" level="generic" tech-domain="to" name="Platform Tools">
 <collection id="gfxconversion" name="Graphics Conversion">
 <component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
-<!-- Removed bmconv from builds     <unit bldFile="gfxconversion/bmconv_s60/group"/>   -->
+<unit bldFile="/mw/platformtools/gfxconversion/bmconv_s60/group"/>
 </component>
 <component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
 <unit bldFile="/mw/platformtools/gfxconversion/mifconv/group"/>
@@ -7743,19 +7806,19 @@
 <package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc api">
 <collection id="location_plat" name="Location Apps Platform Interfaces" level="api">
 <component id="location_picker_service_api" name="Location Picker Service API" introduced="^4" class="api" filter="s60">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/location/location_plat" qt:proFile="location_plat.pro"/>
+<unit bldFile="/app/location/location_plat" qt:proFile="location_plat.pro"/>
 </component>
 </collection>
 <collection id="locationpickerservice" name="Location Picker Service" level="loc">
 <!--collection is really a component. Should move down a directory -->
 <component id="locationpickerservice_build" filter="s60" name="Location Picker Service Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/location/locationpickerservice" qt:proFile="locationpickerservice.pro"/>
+<unit bldFile="/app/location/locationpickerservice" qt:proFile="locationpickerservice.pro"/>
 </component>
 </collection>
 <collection id="locationdataharvester" name="Location Data Harvester" level="events">
 <!--collection is really a component. Should move down a directory -->
 <component id="locationdataharvester_build" name="Location Data Harvester Build" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/location/locationdataharvester" qt:proFile="locationdataharvester.pro"/>
+<unit bldFile="/app/location/locationdataharvester" qt:proFile="locationdataharvester.pro"/>
 </component>
 </collection>
 </package>
@@ -7781,21 +7844,21 @@
 <unit bldFile="/app/phone/phoneapp/phonemediatorcenter/group"/>
 </component>
 <component id="phoneuiview2" filter="s60" name="Phone UI View">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
+<unit bldFile="/app/phone/phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
 </component>
 <component id="phoneuiqtviewadapter" filter="s60" name="Phone UI Qt View Adapter" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
+<unit bldFile="/app/phone/phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
 </component>
 <component id="phonestringloader" filter="s60" name="Phone String Loader" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
+<unit bldFile="/app/phone/phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
 </component>
 <component id="phoneui2" filter="s60" name="Phone UI">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
+<unit bldFile="/app/phone/phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
 </component>
 </collection>
 <collection id="phoneengine" name="Phone Engine" level="engine">
 <component id="phonecntfinder2" filter="s60" name="Phone Contact Finder">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
+<unit bldFile="/app/phone/phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
 </component>
 <component id="audiohandling" filter="s60" name="Phone Audio Handling">
 <unit bldFile="/app/phone/phoneengine/audiohandling/group"/>
@@ -7813,21 +7876,21 @@
 <unit bldFile="/app/phone/phoneengine/engineinfo/group"/>
 </component>
 <component id="phonemodel" filter="s60" name="Phone Model">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
+<unit bldFile="/app/phone/phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
 </component>
 <component id="servicehandling" filter="s60" name="Phone Service Handling">
 <unit bldFile="/app/phone/phoneengine/servicehandling/group"/>
 </component>
 <component id="phoneservices" filter="s60" name="Phone Server" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
+<unit bldFile="/app/phone/phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
 </component>
 <component id="parserrecognizer" filter="s60" name="Parser Recognizer" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneengine/parserrecognizer" qt:proFile="parserrecognizer.pro"/>
+<unit bldFile="/app/phone/phoneengine/parserrecognizer" qt:proFile="parserrecognizer.pro"/>
 </component>
 </collection>
 <collection id="phoneuis" name="Phone UIs" level="ui">
 <component id="bubblemanager2" filter="s60" name="Phone Bubble Manager">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
+<unit bldFile="/app/phone/phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
 </component>
 <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
 <unit bldFile="/app/phone/phoneuis/telephonydevicemode/group"/>
@@ -7882,15 +7945,15 @@
 <unit bldFile="/app/phone/phoneplugins/csplugin/group"/>
 </component>
 <component id="hsdialerwidgetplugin" filter="s60" name="Home Screen Dialer Widget Plugin" class="plugin" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
+<unit bldFile="/app/phone/phoneplugins/hsdialerwidgetplugin" qt:proFile="hsdialerwidgetplugin.pro"/>
 </component>
 <component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
+<unit bldFile="/app/phone/phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
 </component>
 </collection>
 <collection id="phonesettings" name="Phone Settings" level="plugin">
 <component id="cpphonesettingsplugins" filter="s60" name="CP Phone Settings Plugins" class="plugin" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/phone/phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
+<unit bldFile="/app/phone/phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
 </component>
 </collection>
 </package>
@@ -7910,34 +7973,22 @@
 </component>
 </collection>
 <collection id="logsui" name="Logs UI" level="ui">
-<!-- split into actual components -->
-<component id="logsservices" filter="s60" name="Logs Services" introduced="^4">
-<!-- <unit bldFile="logsui/logsservices" qt:proFile="logsui.pro"/> -->
-</component>
-<component id="logscntfinder" filter="s60" name="Logs Contact finder">
-<!--<unit bldFile="logsui/logscntfinder" qt:proFile="logscntfinder.pro"/> -->
-</component>
-<component id="logsengine" filter="s60" name="Logs Engine" introduced="^4">
-<!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
-</component>
-<component id="logsapp" filter="s60" name="Logs Application">
-<!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
-</component>
 <component id="logsui_build" filter="s60" name="Logs UI Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/recents/logsui" qt:proFile="logsui.pro"/>
+<!-- component at too high a rank, should move down one directory -->
+<unit bldFile="/app/recents/logsui" qt:proFile="logsui.pro"/>
 </component>
 </collection>
 </package>
 <package id="settingsuis" level="services" tech-domain="dm" name="Settings UIs" levels="plugin ui">
 <collection id="controlpanelplugins" name="Control Panel Plugins" level="plugin">
 <component id="themeplugin" filter="s60" name="Theme Plugin" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/settingsuis/controlpanelplugins/themeplugin" qt:proFile="themeplugin.pro" qt:qmakeArgs="-r -config rom"/>
+<unit bldFile="/app/settingsuis/controlpanelplugins/themeplugin" qt:proFile="themeplugin.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 <collection id="controlpanelui" name="Control Panel UI" level="ui">
 <!-- collection is really a component, move down a dir -->
 <component id="controlpanelui_build" filter="s60" name="Control Panel UI Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/settingsuis/controlpanelui" qt:proFile="controlpanelui.pro" qt:qmakeArgs="-r -config rom"/>
+<unit bldFile="/app/settingsuis/controlpanelui" qt:proFile="controlpanelui.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </package>
@@ -7970,7 +8021,7 @@
 <unit bldFile="/app/contentcontrol/omads/omadsextensions/group"/>
 </component>
 <component id="omadsextensions_qt" filter="s60" name="OMA DS Qt Extensions" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contentcontrol/omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
+<unit bldFile="/app/contentcontrol/omads/omadsextensions" qt:proFile="omadsextensions.pro"/>
 </component>
 </collection>
 </package>
@@ -7983,7 +8034,7 @@
 <collection id="runtimeproviders" name="Runtime Providers" level="support"/>
 <collection id="firsttimeuse_info" name="First Time Use Info" level="ui">
 <component id="firsttimeuse_build" name="First Time Use Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/firsttimeuse" qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
+<unit bldFile="/app/firsttimeuse" qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </package>
@@ -7993,19 +8044,19 @@
 <unit bldFile="/app/devicecontrol/deviceupdatesui/adapters/bld"/>
 </component>
 <component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
 </component>
 <component id="deviceupdatesplugin" name="Device Updates Plugin" filter="s60" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
 </component>
 <component id="deviceupdatesqtsp" name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
+<unit bldFile="/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
 </component>
 <component id="cpqtsp" name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
+<unit bldFile="/app/devicecontrol/deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
 </component>
 <component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
+<unit bldFile="/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
 </component>
 </collection>
 </package>
@@ -8015,17 +8066,13 @@
 <component id="filemanager_plat" name="File Manager Platform Interfaces" class="api" filter="s60" introduced="^4">
 <unit base="/app/files/filemanager/filemanager_plat"/>
 </component>
-<component id="fmbkupengine" filter="s60,bldfirst" name="File Manager Backup Engine" introduced="^4">
+<component id="fmbkupengine" filter="s60" name="File Manager Backup Engine" introduced="^4">
 <unit bldFile="/app/files/filemanager/src/fmbkupengine/group"/>
 </component>
-<component id="fmfiledialog" filter="s60,bldfirst" name="File Manager File Dialog" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/files/filemanager/src/fmfiledialog" qt:proFile="fmfiledialog.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
 <component id="filemanager_build" filter="s60" name="File Manager Build">
 <!-- break this up into components or move down a directory -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/files/filemanager" qt:qmakeArgs="-r" qt:proFile="filemanager.pro"/>
-</component>
-
+<unit bldFile="/app/files/filemanager" qt:qmakeArgs="-r" qt:proFile="filemanager.pro"/>
+</component>
 </collection>
 </package>
 <package id="search" level="apps" tech-domain="pr" name="Search Apps" levels="eng base app api">
@@ -8036,7 +8083,7 @@
 </collection>
 <collection id="searchui" name="Search UI">
 <component id="searchui_build" name="Search UI Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/search/searchui" qt:proFile="searchui.pro"/>
+<unit bldFile="/app/search/searchui" qt:proFile="searchui.pro"/>
 </component>
 </collection>
 </package>
@@ -8047,8 +8094,8 @@
 </component>
 </collection>
 <collection id="phonebookui" name="Phonebook UI" level="ui">
-<component id="cnthistorymodel" filter="s60" name="Contacts History Model" introduced="^4">
-<!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
+<component id="mobhistorymodel" filter="s60" name="Mobile History Model" introduced="^4">
+<!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
 </component>
 <component id="pbkcommonui" filter="s60" name="Phonebook Common UI" introduced="^4">
 <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
@@ -8061,37 +8108,39 @@
 </component>
 <component id="phonebookui_build" filter="s60" name="Phonebook UI Build" introduced="^4">
 <!-- break up into components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookui" qt:proFile="phonebookui.pro"/>
+<unit bldFile="/app/contacts/phonebookui" qt:proFile="phonebookui.pro"/>
+</component>
+</collection>
+<collection id="qtcontactsmobility" name="Qt Contacts Mobility" level="support">
+<component id="qtcontactsmobility_build" filter="s60" name="Qt Contacts Mobility Build" class="plugin" introduced="^4">
+<!-- not really a component, move down a dir? Break up into compnents? -->
+<unit bldFile="/app/contacts/qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
 </component>
 </collection>
 <collection id="phonebookengines" name="Phonebook Engines" level="engine">
 <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
 </component>
 <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
 <unit version="2" bldFile="/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
 </component>
 <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
-</component>
-<component id="qtcontactsmobility" filter="s60" name="Qt Contacts Mobility" class="plugin" introduced="^4">
-<!-- need to move to this actual dir rather than including something from another collection -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
 </component>
 <component id="mobcntmodel" filter="s60" name="Mobile Contacts Model" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
 </component>
 <component id="mobcntactions" filter="s60" name="Mobile Contacts Actions" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
 </component>
 <component id="cntmaptileservice" filter="s60" name="Contacts Map Tile Service" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
 </component>
 <component id="simutility" filter="s60" name="SIM Utility" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/simutility" qt:proFile="simutility.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/simutility" qt:proFile="simutility.pro"/>
 </component>
 <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/contacts/phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
+<unit bldFile="/app/contacts/phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
 </component>
 </collection>
 <collection id="pimprotocols" name="PIM Protocols" level="services">
@@ -8112,13 +8161,13 @@
 <collection id="organizer_pub" name="Organizer Application Suite Public Interfaces" level="app">
 <component id="calendar_interim_utils2_api" name="Calendar Interim Utils 2 API" class="api" filter="s60">
 <!-- move into own .pro file -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/organizer_pub" qt:proFile="organizer_pub.pro"/>
+<unit bldFile="/app/organizer/organizer_pub" qt:proFile="organizer_pub.pro"/>
 </component>
 </collection>
 <collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
 <component id="organizer_plat_build" name="Organizer Application Suite Platform Interface Build" class="api" filter="s60">
-<!-- break up into individual .pro files, move the above metaxmls to those components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/organizer_plat" qt:proFile="organizer_plat.pro"/>
+<!-- break up into individual .pro files -->
+<unit bldFile="/app/organizer/organizer_plat" qt:proFile="organizer_plat.pro"/>
 </component>
 <component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
 <!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
@@ -8145,45 +8194,45 @@
 <collection id="agendainterface" name="Agenda Interface" level="services">
 <!-- collection is really a component, should move down a directory -->
 <component id="agendainterface_build" filter="s60" name="Agenda Interface Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/agendainterface" qt:proFile="agendainterface.pro"/>
+<unit bldFile="/app/organizer/agendainterface" qt:proFile="agendainterface.pro"/>
 </component>
 </collection>
 <collection id="calendarui" name="Calendar UI" level="ui">
 <component id="commonutils" filter="s60" name="Calendar Common Utils">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/commonutils" qt:proFile="commonutils.pro"/>
+<unit bldFile="/app/organizer/calendarui/commonutils" qt:proFile="commonutils.pro"/>
 </component>
 <component id="calenlauncher" filter="s60" name="Calendar Launcher">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
+<unit bldFile="/app/organizer/calendarui/calenlauncher" qt:proFile="calenlauncher.pro"/>
 </component>
 <component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
+<unit bldFile="/app/organizer/calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
 </component>
 <component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
+<unit bldFile="/app/organizer/calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
 </component>
 <component id="globaldata" filter="s60" name="Calendar Global Data">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/globaldata" qt:proFile="globaldata.pro"/>
+<unit bldFile="/app/organizer/calendarui/globaldata" qt:proFile="globaldata.pro"/>
 </component>
 <component id="settings" filter="s60" name="Calendar Settings">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/settings" qt:proFile="settings.pro"/>
+<unit bldFile="/app/organizer/calendarui/settings" qt:proFile="settings.pro"/>
 </component>
 <component id="calenplugins" filter="s60" name="Calendar Plugins" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
+<unit bldFile="/app/organizer/calendarui/calenplugins" qt:proFile="calenplugins.pro"/>
 </component>
 <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
+<unit bldFile="/app/organizer/calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
 </component>
 <component id="views" filter="s60" name="Calendar Views">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/views" qt:proFile="views.pro"/>
+<unit bldFile="/app/organizer/calendarui/views" qt:proFile="views.pro"/>
 </component>
 <component id="calendarui_controller" filter="s60" name="Calendar Controller">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/controller" qt:proFile="controller.pro"/>
+<unit bldFile="/app/organizer/calendarui/controller" qt:proFile="controller.pro"/>
 </component>
 <component id="calendarui_application" filter="s60" name="Calendar Application">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/application" qt:proFile="application.pro"/>
+<unit bldFile="/app/organizer/calendarui/application" qt:proFile="application.pro"/>
 </component>
 <component id="regionalplugins" name="Regional Plugins" filter="s60" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
+<unit bldFile="/app/organizer/calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
 </component>
 <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
 <!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
@@ -8191,10 +8240,10 @@
 </collection>
 <collection id="notes" name="Notes" level="ui">
 <component id="noteseditor" filter="s60" name="Notes Editor" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
+<unit bldFile="/app/organizer/notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
 </component>
 <component id="notes_build" filter="s60" name="Notes Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/notes" qt:proFile="notes.pro"/>
+<unit bldFile="/app/organizer/notes" qt:proFile="notes.pro"/>
 </component>
 </collection>
 <collection id="calendarengines" name="Calendar Engines" level="engine">
@@ -8225,9 +8274,12 @@
 <component id="clockui" filter="s60" name="Clock UI">
 <!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
 </component>
+<component id="ftudatetimewizard" filter="s60" name="First Time Use Date/Time Wizard" introduced="^4">
+<!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
+</component>
 <component id="clock_build" filter="s60" name="Clock Build">
 <!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/clock" qt:proFile="clock.pro"/>
+<unit bldFile="/app/organizer/clock" qt:proFile="clock.pro"/>
 </component>
 </collection>
 <collection id="pimappservices" name="PIM Application Services" level="services">
@@ -8255,7 +8307,7 @@
 <collection id="alarmui" name="Alarm UI" level="app">
 <!-- collection is really a component, should move down a directory -->
 <component id="alarmui_build" filter="s60" name="Alarm UI Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/organizer/alarmui" qt:proFile="alarmui.pro"/>
+<unit bldFile="/app/organizer/alarmui" qt:proFile="alarmui.pro"/>
 </component>
 </collection>
 <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
@@ -8301,7 +8353,7 @@
 </component>
 <component id="msg_plat_build" name="Messaging Apps Platform APIs Build" class="api" filter="s60" introduced="^4">
 <!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-<unit xmlns:qt="http://www.nokia.com/qt" base="/app/messaging/msg_plat" qt:proFile="msg_plat.pro" qt:qmakeArgs="-r"/>
+<unit base="/app/messaging/msg_plat" qt:proFile="msg_plat.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="msg_pub" name="Messaging Apps Public APIs" level="api">
@@ -8313,7 +8365,7 @@
 </component>
 <component id="msg_pub_build" name="Messaging Apps Public APIs Build" class="api" filter="s60" introduced="^4">
 <!-- break this up into the above units and replace their base attributes with bldFile, etc -->
-<unit xmlns:qt="http://www.nokia.com/qt" base="/app/messaging/msg_pub" qt:proFile="msg_pub.pro" qt:qmakeArgs="-r"/>
+<unit base="/app/messaging/msg_pub" qt:proFile="msg_pub.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="mobilemessaging" name="Mobile Messaging" level="plugin">
@@ -8324,7 +8376,7 @@
 <collection id="messagingappbase" name="Messaging App Base" level="base">
 <component id="messagingappbase_build" filter="s60" name="Messaging App Base Build" introduced="^4">
 <!-- break this up into the below components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingappbase" qt:proFile="messagingappbase.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingappbase" qt:proFile="messagingappbase.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgmedia" filter="s60" name="Message Media">
 <unit base="/app/messaging/messagingappbase/msgmedia"/>
@@ -8381,36 +8433,34 @@
 </component>
 <component id="mmsengine_build" filter="s60" name="MMS Engine Build">
 <!-- this should be broken up into the individual other components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/mmsengine" qt:proFile="mmsengine.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="messagingapp" name="Messaging Application" level="app">
-<component id="messaging_conf" filter="s60" name="Messaging Application Configuration" class="config" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/conf" qt:proFile="messaging_conf.pro" qt:qmakeArgs="-r"/>
+<component id="messagingapp_build" filter="s60" name="MMS Engine Build">
+<!-- this should be broken up into the individual other components -->
+<unit bldFile="/app/messaging/messagingapp" qt:proFile="messagingapp.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgutils" filter="s60" name="Messaging Utils" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgappfw" filter="s60" name="Messaging Application Framework" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/msgappfw" qt:proFile="msgappfw.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgsettings" filter="s60" name="Messaging Settings" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/msgsettings" qt:proFile="msgsettings.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgnotifications" filter="s60" name="Messaging Notifications" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/msgnotifications" qt:proFile="msgnotifications.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="smartmessaging" filter="s60" name="Smart Messaging">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/smartmessaging" qt:proFile="smartmessaging.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="shareui" filter="s60" name="Shared UI" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/shareui" qt:proFile="shareui.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="msgui" filter="s60" name="Messaging UI" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
-</component>
-<component id="msgservices" filter="s60" name="Messaging Services" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/messaging/messagingapp/msgservices" qt:proFile="msgservices.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/messaging/messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="email" name="Email" level="plugin">
@@ -8454,9 +8504,6 @@
 <component id="nmailagent" filter="s60" name="Nmail Agent" introduced="^4">
 <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
 </component>
-<component id="nmutilities" filter="s60" name="Nmail Utilities" introduced="^4">
-<!-- <unit bldFile="emailservices/nmutilities" qt:proFile="nmutilities.pro"/> -->
-</component>
 </collection>
 <collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
 <component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
@@ -8507,7 +8554,7 @@
 <collection id="commonemail_info" name="Email Apps Info" level="app">
 <component id="commonemail_build" name="Email Apps Build" introduced="^4">
 <!-- split into actual components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/commonemail" qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/commonemail" qt:proFile="nmail.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 </package>
@@ -8515,15 +8562,15 @@
 <collection id="camerauis" name="Camera UIs">
 <component id="cameraxui" filter="s60" name="CameraX UIs">
 <meta rel="testbuild">
-<group xmlns:qt="http://www.nokia.com/qt" name="camera_unit_tests"/>
+<group name="camera_unit_tests"/>
 </meta>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/camera/camerauis/cameraxui" qt:proFile="camerax.pro" filter="!test"/>
+<unit bldFile="/app/camera/camerauis/cameraxui" qt:proFile="camerax.pro" filter="!test"/>
 
 </component>
 </collection>
 </package>
-<package id="imgeditor" level="apps" tech-domain="ma" name="Image Editor"/>
-<package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor"/>
+<!-- <package id="imgeditor" level="apps" tech-domain="ma" href="../../../../app/imgeditor/package_definition.xml"/> -->
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
 <package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
 <collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
 <component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
@@ -8538,15 +8585,15 @@
 <unit bldFile="/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
 </component>
 <component id="videocollectionwrapper" filter="s60" name="Video Collection Wrapper" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/videoplayer/videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
 </component>
 
 <component id="videocollectionview" filter="s60" name="Video Collection View" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videocollection/videocollectionview" qt:proFile="videocollectionview.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/videoplayer/videocollection/videocollectionview" qt:proFile="videocollectionview.pro" qt:qmakeArgs="-r"/>
 </component>
 
 <component id="videofiledetailsview" filter="s60" name="Video File Details View" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videocollection/videofiledetailsview" qt:proFile="videofiledetailsview.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/videoplayer/videocollection/videofiledetailsview" qt:proFile="videofiledetailsview.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="mediasettings" name="Media Settings" level="support">
@@ -8557,18 +8604,18 @@
 </collection>
 <collection id="videoplayerapp" name="Video Player App" level="apps">
 <component id="videoplayerengine" name="Video Player Engine" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/videoplayer/videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="hbvideoplayer" filter="s60" name="HB Video Player" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/videoplayer/videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
 <component id="hbvideoplaybackview" filter="s60" name="HB Video Playback View" class="plugin" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayback/hbvideoplaybackview" qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/videoplayer/videoplayback/hbvideoplaybackview" qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="hbvideoplaybackviewplugin" filter="s60" name="HB Video Playback View Plugin" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
 </component>
 <component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
 <unit bldFile="/app/videoplayer/videoplayback/videohelix/group"/>
@@ -8613,11 +8660,6 @@
 <!--<unit bldFile="main" qt:proFile="main.pro"/> -->
 </component>
 </collection>
-<collection id="gallery" name="Gallery" level="ui">
-<component id="gallery_build" filter="s60" name="Gallery Build" introduced="^4">
-<!--<unit bldFile="gallery" qt:proFile="gallery.pro"/> -->
-</component>
-</collection>
 <collection id="imageviewerapp" name="Image Viewer App" level="support">
 <component id="imageviewerapp_build" filter="s60" name="Image Viewer App Build" introduced="^4">
 <!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
@@ -8626,12 +8668,12 @@
 <collection id="photos_info" name="Photos Info" level="support">
 <component id="photos_build" filter="s60" name="Photos Build" introduced="^4">
 <!--  split this up into the above components  -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/photos" qt:proFile="photos.pro"/>
+<unit bldFile="/app/photos" qt:proFile="photos.pro"/>
 </component>
 </collection>
 </package>
-<package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support engine app">
-<!-- move the rom .pri files into their components and uncomment the units -->
+<package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support hs app">
+<!-- move the export .pri files into their components and uncomment the units -->
 <collection id="musicplayer_utilities " name="Music Player Utilities" level="support">
 <component id="mpnowplayingbanner" filter="s60" name="MP Now Playing Banner" introduced="^4">
 <!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
@@ -8640,10 +8682,10 @@
 <!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection id="musicservices " name="Music Services" level="support">
+<collection id="musicfetcher " name="Music Fetcher" level="support">
 <!-- collection is really a component, move down a directory -->
-<component id="musicservices_build" filter="s60" name="Music Services Build" introduced="^4">
-<!-- <unit bldFile="musicservices" qt:proFile="musicservices.pro" qt:qmakeArgs="-r -config rom"/> -->
+<component id="musicfetcher_buld" filter="s60" name="Music Fetcher Build" introduced="^4">
+<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
 <collection id="musicplayer_app " name="Music Player Application" level="app">
@@ -8652,33 +8694,12 @@
 <!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
 </component>
 </collection>
-<collection id="mpdata " name="Music Player Data" level="support">
-<!-- collection is really a component, move down a directory -->
-<component id="mpdata_build" filter="s60" name="Music Player Data Build" introduced="^4">
-<!-- <unit bldFile="mpdata" qt:proFile="mpdata.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection id="mpengine " name="Music Player Engine" level="engine">
-<!-- collection is really a component, move down a directory -->
-<component id="mpengine_build" filter="s60" name="Music Player Engine Build" introduced="^4">
-<!-- <unit bldFile="mpengine" qt:proFile="mpengine.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-</collection>
-<collection id="mpviewplugins" name="Music Player View Plugins" level="plugins">
+<collection id="mpviewplugins " name="Music Player View Plugins" level="plugins">
 <component id="mpcollectionviewplugin" filter="s60" name="MP Collection View Plugin" introduced="^4" class="plugin">
-<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+<!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
 </component>
 <component id="mpplaybackviewplugin" filter="s60" name="MP Playback View Plugin" introduced="^4" class="plugin">
-<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin" qt:proFile="mpplaybackviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component id="mpsettingsviewplugin" filter="s60" name="MP Settings View Plugin" introduced="^4" class="plugin">
-<!--<unit bldFile="mpviewplugins/mpsettingsviewplugin" qt:proFile="mpsettingsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component id="mpdetailsviewplugin" filter="s60" name="MP Details View Plugin" introduced="^4" class="plugin">
-<!--<unit bldFile="mpviewplugins/mpdetailsviewplugin" qt:proFile="mpdetailsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
-</component>
-<component id="mpmediawallviewplugin" filter="s60" name="MP Media Wall View Plugin" introduced="^4" class="plugin">
-<!--<unit bldFile="mpviewplugins/mpmediawallviewplugin" qt:proFile="mpmediawallviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+<!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
 </component>
 </collection>
 <collection id="mpserviceplugins" name="Music Player Service Plugins" level="plugins">
@@ -8692,30 +8713,24 @@
 <component id="mpxsqlitedbcommon" filter="s60" name="MPX SQLite Database Common" introduced="^4">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
 </component>
-<component id="mpxsqlitedbhgplugin" filter="s60" name="MPX SQLite Database Hg Plugin" introduced="^4" class="plugin">
-<!--<unit bldFile="mpserviceplugins/mpxsqlitedbhgplugin/group"/>-->
-</component>
 <component id="mpxsqlitedbplugin" filter="s60" name="MPX SQLite Database Plugin" introduced="^4" class="plugin">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
 </component>
 <component id="mpxsqlitepodcastdbplugin" filter="s60" name="MPX SQLlite Podcast Database Plugin" introduced="^4" class="plugin">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
 </component>
-<component id="mpxinmemoryplugin" filter="s60" name="MPX In-Memory Plugin" introduced="^4" class="plugin">
-<!--<unit bldFile="mpserviceplugins/mpxinmemoryplugin/group"/>-->
-</component>
 <component id="m3uplaylistplugin" filter="s60" name="M3U Playlist Plugin" introduced="^4" class="plugin">
 <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
 </component>
 </collection>
 <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
 <component id="musicplayer_build" filter="s60" name="Music Player Build">
-<!-- break up into individual components. ROM includes should be in their components -->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/musicplayer" qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
+<!-- should brak up into individual components  -->
+<unit bldFile="/app/musicplayer" qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 </collection>
 </package>
-<package id="radio" level="apps" tech-domain="ma" name="Radio Apps" levels="engine plugin ui">
+<package id="radio" level="apps" tech-domain="ma" name="Radio Apps" levels="engine ui">
 <collection id="radioengine" name="Radio Engine" level="engine">
 <component id="radioengineutils" filter="s60" name="Radio Engine Utils" introduced="^4">
 <unit bldFile="/app/radio/radioengine/utils/group"/>
@@ -8729,35 +8744,24 @@
 </collection>
 <collection id="radioapp" name="Radio App" level="ui">
 <component id="radioenginewrapper" filter="s60" name="Radio Engine Wrapper" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radioenginewrapper" qt:proFile="radioenginewrapper.pro"/>
+<unit bldFile="/app/radio/radioapp/radioenginewrapper" qt:proFile="radioenginewrapper.pro"/>
 </component>
 <component id="radiopresetstorage" filter="s60" name="Radio Preset Storage" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radiopresetstorage" qt:proFile="radiopresetstorage.pro"/>
+<unit bldFile="/app/radio/radioapp/radiopresetstorage" qt:proFile="radiopresetstorage.pro"/>
 </component>
 <component id="radiouiengine" filter="s60" name="Radio UI Engine" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radiouiengine" qt:proFile="radiouiengine.pro"/>
+<unit bldFile="/app/radio/radioapp/radiouiengine" qt:proFile="radiouiengine.pro"/>
 </component>
 <component id="radiowidgets" filter="s60" name="Radio Widgets" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radiowidgets" qt:proFile="radiowidgets.pro"/>
+<unit bldFile="/app/radio/radioapp/radiowidgets" qt:proFile="radiowidgets.pro"/>
 </component>
 <component id="radioapplication" filter="s60" name="Radio Application" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
+<unit bldFile="/app/radio/radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
 </component>
 <component id="radio_rom" filter="s60" name="Radio ROM" introduced="^4">
 <unit bldFile="/app/radio/rom"/>
 </component>
 </collection>
-<collection id="radio_hswidgetplugin" name="FM Radio Homescreen Widget Plugin" level="plugin">
-<component id="fmradiohswidgetplugin" filter="s60" name="FM Radio HS Widget Plugin" class="plugin" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/hswidgetplugin/fmradiohswidgetplugin" qt:proFile="fmradiohswidgetplugin.pro"/>
-</component>
-<component id="fmradiohswidgetplugininstaller" filter="s60" name="FM Radio HS Widget Plugin Installer" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/hswidgetplugin/fmradiohswidgetplugininstaller" qt:proFile="fmradiohswidgetplugininstaller.pro"/>
-</component>
-<component id="fmradiohswidgetplugin_exports_to_rom" filter="s60" name="FM Radio HS Widget Plugin ROM" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/radio/hswidgetplugin" qt:proFile="fmradiohswidgetplugin_exports_to_rom.pri"/>
-</component>
-</collection>
 </package>
 <package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps" levels="engine server ui">
 <collection id="internetradio2_0" name="Internet Radio 2.0" level="ui">
@@ -8775,7 +8779,7 @@
 <collection id="qtinternetradio" name="Qt Internet Radio">
 <component id="qtinternetradio_build" name="Qt Internet Radio Build">
 <!--  Move down a dir or break into components-->
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/internetradio/qtinternetradio" qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
+<unit bldFile="/app/internetradio/qtinternetradio" qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
 </component>
 
 </collection>
@@ -8795,50 +8799,40 @@
 </collection>
 </package>
 <package id="homescreen" level="apps" tech-domain="ui" name="Home Screen Apps" levels="support task ss hs">
+<collection id="homescreen_info" name="Home Screen Info" level="support">
+<component id="homescreen_build" name="Homescreen Build">
+<!-- break this up properly into components -->
+<unit bldFile="/app/homescreen" qt:proFile="homescreen.pro" qt:qmakeArgs="-r -config rom"/>
+</component>
+</collection>
 <collection id="homescreen_test" name="Home Screen Test" level="support">
 
 </collection>
+<!-- fiill in details with broken up homescreen_build -->
 <collection id="homescreenapp" name="Home Screen Application" level="hs">
-<component id="hsutils" name="Home Screen Utils" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hsutils" qt:proFile="hsutils.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="hsdomainmodel" name="HS Domain Model" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hsdomainmodel" qt:proFile="hsdomainmodel.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/runtimeplugins" qt:proFile="runtimeplugins.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/serviceproviders" qt:proFile="serviceproviders.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/stateplugins" qt:proFile="stateplugins.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/widgetplugins" qt:proFile="widgetplugins.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="hsapplication" name="Home Screen Application" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hsapplication" qt:proFile="hsapplication.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="hsmenuclientplugin" name="Home Screen Menu Client Plugin" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hsmenuclientplugin" qt:proFile="hsmenuclientplugin.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="hshomescreenclientplugin" name="HS Menu Client Plugin" introduced="^4" class="plugin">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hshomescreenclientplugin" qt:proFile="hshomescreenclientplugin.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="hswidgetuninstaller" name="HS Widget Uninstaller" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp/hswidgetuninstaller" qt:proFile="hswidgetuninstaller.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="homescreenapp_rom" name="Home Screen App ROM" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/homescreenapp" qt:proFile="homescreenapp_exports_to_rom.pri" qt:qmakeArgs="-r -config rom"/>
-</component>
+<component id="hsutils" name="Home Screen Utils" introduced="^4"/>
+<component id="hsdomainmodel" name="HS Domain Model" introduced="^4"/>
+<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin"/>
+<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin"/>
+<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin"/>
+<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin"/>
+<component id="hsapplication" name="Home Screen Application" introduced="^4"/>
+<component id="hshomescreenclientplugin" name="Home Screen Client Plugin" introduced="^4" class="plugin"/>
+<component id="hsmenucontentpublish" name="HS Menu Content Publish" introduced="^4"/>
+</collection>
+<collection id="screensaverapp" name="Screen Saver Application" level="ss">
+<component id="snsrutils" name="Screen Saver Utils" introduced="^4"/>
+<component id="snsr_serviceproviders" name="Screen Saver Service Providers" introduced="^4" class="plugin"/>
+<component id="snsr_stateproviders" name="Screen Saver State Providers" introduced="^4" class="plugin"/>
+<component id="snsr_runtimeproviders" name="Screen Saver Runtime Providers" introduced="^4" class="plugin"/>
+<component id="snsrapplication" name="Screen Saver Application" introduced="^4"/>
+<component id="screensaverproviders" name="Screen Saver Providers" introduced="^4" class="plugin"/>
 </collection>
 <collection id="taskswitcherapp" name="Task Switcher Application" level="task">
-<!-- break collection info components, or move down a dir and make it a component -->
-<component id="taskswitcherapp_build" name="Task Switcher Application Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/homescreen/taskswitcherapp" qt:proFile="taskswitcherapp.pro" qt:qmakeArgs="-r -config rom"/>
-</component>
-<component id="tsdevicedialogplugin" name="Task Switcher Device Dialog Plugin" introduced="^4" class="plugin"/>
+<component id="taskswitcherappecom" name="Task Switcher Application ECom" introduced="^4"/>
+<component id="tsserviceplugin" name="Task Switcher Service Plugin" introduced="^4" class="plugin"/>
+<component id="ts_runtimeplugins" name="TS Runtime Plugins" introduced="^4" class="plugin"/>
+<component id="tsapplication" name="Task Switcher Application" introduced="^4"/>
 </collection>
 </package>
 <package id="jrt" level="services" tech-domain="rt" name="Java Runtime" levels="util generic rt ui">
@@ -8853,58 +8847,53 @@
 <unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
 </component>
 </collection>
-<collection id="java_stubs" name="Java Stubs" level="rt">
-<component id="java_stubs_build" name="Build Native Java" filter="sf_build" introduced="^4">
-<unit bldFile="/app/jrt/java_stubs/group"/>
-</component>
-</collection>
 <collection id="build_nativejava" name="Build Native Java">
 <component id="nativejava" name="Build Native Java" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javacommons" name="Java Commons" level="generic">
 <component id="javacommons_build" filter="s60" name="JRT Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javaruntimes" name="Java Runtimes" level="rt">
 <component id="javaruntimes_build" filter="s60" name="JRT Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javauis" name="Java UIs" level="ui">
 <component id="javauis_build" filter="s60" name="JRT Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javamanager" level="generic">
 <component id="javamanager_build" filter="s60" name="JRT Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javatools" name="Java Tools" level="util">
 <component id="javatools_build" filter="s60" name="JRT Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 <collection id="javaextensions" name="Java Extensions" level="generic">
 <component id="javaextensions_build" filter="s60" name="JRT Build">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
+<unit bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
+<unit bldFile="/app/jrt/javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
 </component>
 </collection>
 </package>
 <package id="browserui" level="services" tech-domain="rt" name="Browser UI" levels="utils support ui">
 <collection id="browserui_info" name="Browser UI Info" level="ui">
 <component id="browserui_build" name="Bookmarks Engine Build" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/browserui" qt:proFile="browserui.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
+<unit bldFile="/app/browserui" qt:proFile="browserui.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
 </component>
 </collection>
 </package>
@@ -8925,64 +8914,79 @@
 <collection id="creator" name="Creator" level="support">
 <!-- collection is really a component. Should move down a directory -->
 <component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/creator" qt:proFile="creator.pro"/>
+<unit bldFile="/app/rndtools/creator" qt:qmakeArgs="-r" qt:proFile="creator.pro"/>
 </component>
 </collection>
 <collection id="filebrowser" name="File Browser" level="util">
-<!-- collection is really a component. Should move down a directory -->
-<component id="filebrowser_build" filter="s60" name="File Browser Build" purpose="development" target="device" class="tool">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/filebrowser" qt:proFile="filebrowser.pro"/>
+<!-- consider collapsing into a single component -->
+<component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
+<meta rel="config">
+<not-defined condition="FILEBROWSER_LITE"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
+</component>
+<component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
+<meta rel="config">
+<not-defined condition="FILEBROWSER_LITE"/>
+</meta>
+<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
+<!--<unit bldFile="filebrowser/fileopclient/group"/>-->
+</component>
+<component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
+<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
+<unit bldFile="/app/rndtools/filebrowser/group"/>
 </component>
 </collection>
 <collection id="launcher" name="Launcher" level="util">
 <!-- collection is really a component. Should move down a directory -->
 <component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/launcher" qt:proFile="launcher.pro"/>
+<unit bldFile="/app/rndtools/launcher/group"/>
 </component>
 </collection>
 <collection id="loadgen" name="Load Generator" level="test">
 <!-- collection is really a component. Should move down a directory -->
 <component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/loadgen" qt:proFile="loadgen.pro"/>
+<unit bldFile="/app/rndtools/loadgen/group"/>
 </component>
 </collection>
 <collection id="perfmon" name="Performance Monitor" level="test">
 <!-- collection is really a component. Should move down a directory -->
 <component id="perfmon_build" filter="s60" name="Performance Monitor Tool" purpose="development" target="device" class="tool">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/perfmon" qt:proFile="perfmon.pro"/>
-</component>
-</collection>
-<collection id="piprofilerui" name="Performance Investigator Profiler UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component id="piprofilerui_build" filter="s60" name="Performance Investigator Profiler UI Build" purpose="development" target="device" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/piprofilerui" qt:proFile="piprofilerui.pro"/>
+<unit bldFile="/app/rndtools/perfmon" qt:proFile="perfmon.pro"/>
 </component>
 </collection>
 <collection id="screengrabber" name="Screen Grabber" level="util">
 <!-- collection is really a component. Should move down a directory -->
 <component id="screengrabber_build" filter="s60" name="ScreenGrabber" purpose="development" target="device" class="tool">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/screengrabber" qt:proFile="screengrabber.pro"/>
+<unit bldFile="/app/rndtools/screengrabber" qt:proFile="screengrabber.pro"/>
 </component>
 </collection>
 <collection id="stifui" name="STIF UI" level="generic">
-<component id="stifuiqt" filter="s60" name="STIF Qt UI" purpose="development" target="device" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/stifui/qt" qt:proFile="stifqtui.pro"/>
-<!-- should use stifuiqt as the dir name -->
-</component>
-</collection>
-<collection id="memspyui" name="Memspy UI" level="generic">
-<!-- collection is really a component. Should move down a directory -->
-<component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/memspyui" qt:proFile="memspyui.pro"/>
+<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
+<unit bldFile="/app/rndtools/stifui/akvon/group"/>
 </component>
 </collection>
 <collection id="htiui" name="Harmonized Test Interface UI" level="generic">
-<component id="htiui_build" filter="s60" name="HTI UI Build" purpose="development" target="device">
-<!-- should split up into individual components -->
-<unit bldFile="/app/rndtools/htiui/group"/>
-</component>
-<component id="htiadminqt" filter="s60" name="HTI Admin Qt" purpose="development" target="device">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/htiui/htiadminqt" qt:proFile="HtiAdmin.pro"/>
+<component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
+<!-- can only have a single unit. Should #include from a common bld.inf file -->
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
+<unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+</component>
+<component id="htidevicereboot" filter="s60" name="HTI Device Reboot" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htidevicereboot/group"/>
+</component>
+<component id="htistartupwait" filter="s60" name="HTI Startup Wait" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htistartupwait/group"/>
+</component>
+<component id="htiadmin" filter="s60" name="HTI Admin" purpose="development" target="device">
+<unit bldFile="/app/rndtools/htiui/htiadmin/group"/>
 </component>
 </collection>
 </package>
@@ -8990,7 +8994,7 @@
 <collection id="userguide" name="User Guide" level="if">
 <!-- collection is really a component. Move down a directory -->
 <component id="userguide_build" name="User Guide Build" filter="s60" introduced="^4">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/helps/userguide" qt:proFile="Userguide.pro"/>
+<unit bldFile="/app/helps/userguide" qt:proFile="Userguide.pro"/>
 </component>
 </collection>
 <collection id="symhelp" name="Symbian Help" level="eng">