FCL/sftools/fbf/projects/platforms: comparison foundation/sysdefs/system_model

equal deleted inserted replaced

-:f11180421939
+:40c430068ab4
 <systemModel>
 <layer name="adaptation" long-name="Adaptation">
 <block name="stubs" long-name="Stubs" tech_domain="hb" levels="adaptation plugin mid engine">
 <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs">
+<!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/> -->
 <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
 <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
 <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
 <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub">
 </component>
 <component name="tspclientmapper" long-name="TSP Client Mapper">
 <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/group"/>
 <!-- <unit bldFile="os/devicesrv/accessoryservices/tspclientmapper/tsrc/public/basic/group"/> -->
 </component>
-<component name="remotecontrolfw">
+<!--Component manually removed and merged to OS-->
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/bearerplugin/group"/>
+<!--<component name="remotecontrolfw">
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/client"/>
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/bearerplugin/group"/>
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/converterplugin/group"/>
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/client"/>
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/reference"/>
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/converterplugin/group"/>
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/server/group"/>
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/reference"/>
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/targetselectorplugin/group"/>
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/server/group"/>
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/test"/>
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/targetselectorplugin/group"/>
-<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/types/group"/>
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/test"/>
-</component>
+<unit bldFile="os/devicesrv/accessoryservices/remotecontrolfw/types/group"/>
+</component>-->
 <component name="reftsp"/>
 <component unofficial="yes" name="accessoryservices_build" long-name="Accessory Services Build">
 <unit bldFile="os/devicesrv/accessoryservices/group"/>
 </component>
 </collection>
 </component>
 <component name="hwresourcesmgr">
 <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/test/group"/>
 <unit bldFile="os/devicesrv/resourcemgmt/hwresourcesmgr/test/plugins/targetmodifierplugin/group"/>
 </component>
-<component name="powerandmemorynotificationservice"/>
+<!--Component manually removed as empty and name conflicts with an OS component-->
+<!--<component name="powerandmemorynotificationservice"/>-->
 <component unofficial="yes" name="resourcemgmt_build" long-name="Resource Management Build">
 <unit bldFile="os/devicesrv/resourcemgmt/group"/>
 </component>
 <component unofficial="yes" name="resourcemgmt_test" long-name="Resource Management Test">
 <!-- <unit bldFile="os/devicesrv/resourcemgmt/tsrc/public/basic/group"/> -->
 <component name="starter" long-name="Starter">
 <unit bldFile="os/devicesrv/sysstatemgmt/starter/group"/>
 <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecnote/group"/> -->
 <!-- <unit bldFile="os/devicesrv/sysstatemgmt/starter/strtsecobs/group"/> -->
 </component>
-<component name="systemstarter">
+<!--Component manually removed and merged to OS-->
-<!-- <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/sysmondemo/group"/> -->
+<!--<component name="systemstarter">
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tamastarter/group"/>
+-  <unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/sysmondemo/group"/>  -
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tapstart/group"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tamastarter/group"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tdscstore/group"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tapstart/group"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappgood"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tdscstore/group"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappnorv"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappgood"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testapprvafterretry"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappnorv"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testapprverror"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testapprvafterretry"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappslow"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testapprverror"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testprocgood"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testappslow"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/trestartsys/group"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/testprocgood"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tstartsafe/group"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/trestartsys/group"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tstartupproperties/group"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tstartsafe/group"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysmon/group"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tstartupproperties/group"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart/group"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysmon/group"/>
-<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart2/group"/>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart/group"/>
-</component>
+<unit bldFile="os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart2/group"/>
+</component>-->
 <component unofficial="yes" name="sysstatemgmt_build" long-name="System State Management Build">
 <unit bldFile="os/devicesrv/sysstatemgmt/group"/>
 </component>
 <component unofficial="yes" name="sysstatemgmt_test" long-name="System State Management Test">
 <!-- <unit bldFile="os/devicesrv/sysstatemgmt/tsrc/public/basic/group"/> -->
 <component unofficial="yes" name="phone_parser_api">
 <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/group"/>
 <!-- <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
 </component>
 <component unofficial="yes" name="sensor_data_compensator_api">
+<!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
 <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
 </component>
 <component unofficial="yes" name="version_info_api">
 <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
 <!-- <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
 <unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
 </component>
 </collection>
 </block>
 <block name="cellularsrv" long-name="Cellular Baseband Services" tech_domain="vc" level="services" levels="adaptation hw-if plugin framework server app-if">
-<collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="app-if">
+<collection name="telephonyserverplugins" long-name="Telephony Server Plugins">
-<component name="common_tsy" long-name="Common TSY">
+<!--Component manually removed, already declared in OS-->
-	  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/group"/>
+<!--<component name="common_tsy">
-<!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/group"/> -->
+-  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/group"/>  -
-<!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/group"/> -->
+-  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/group"/>  -
-<!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group"/> -->
+-  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group"/>  -
-<!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group"/> -->
+-  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group"/>  -
-<!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/devlon_93"/> -->
+-  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/group"/>  -
-<!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/group"/> -->
+-  <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/testsuites/group"/>  -
-<!-- <unit bldFile="os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/testsuites/group"/> -->
+</component>-->
-</component>
+<!--Component manually removed as empty and name conflicts with an OS component-->
-	 <component name="licenseetsystub" long-name="Licensee TSY Stub">
+<!--<component name="multimodetsy"/>-->
-	  <unit bldFile="os/cellularsrv/telephonyserverplugins/licenseetsystub/group"/>
+<!--Component manually removed and merged to OS-->
-	 </component>
+<!--<component name="cdmatsy"/>-->
-<component name="multimodetsy"/>
+<!--Component manually removed as empty and name conflicts with an OS component-->
-<component name="cdmatsy"/>
+<!--<component name="simtsy"/>-->
-<component name="simtsy"/>
 </collection>
 <collection name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
 <component name="gennif" long-name="Generic NIF">
 <unit bldFile="os/cellularsrv/commonnetworkinterface/gennif/group"/>
 </component>
 </collection>
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
 <component name="isc_if" long-name="ISC Interface">
 <unit bldFile="os/cellularsrv/basebandabstraction/isc_if/group"/>
 </component>
-<component name="basebandchanneladaptor">
+<!--Component manually removed and merged to OS, unit originately commented out by Bob's script-->
-<!-- <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/test/te_bca/group"/> -->
+<!--<component name="basebandchanneladaptor">
-</component>
+-  <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/test/te_bca/group"/>  -
-<component name="intersystemcomm"/>
+</component>-->
+<!--Component manually removed as empty and name conflicts with an OS component-->
+<!--<component name="intersystemcomm"/>-->
 </collection>
 <collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
 <component unofficial="yes" name="cellularsrv_build" long-name="Cellular Baseband Services Build">
 <unit bldFile="os/cellularsrv/group"/>
 </component>
 <unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
 </component>
 <component unofficial="yes" name="ilbc_decoder_interface_api">
 <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
 </component>
-<component unofficial="yes" name="audio_server_factory_api">
-<unit bldFile="os/mm/mm_plat/audio_server_factory_api/group"/>
-</component>
 <component unofficial="yes" name="g711_decoder_interface_proxy_api">
 <unit bldFile="os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
 </component>
 <component unofficial="yes" name="audio_effects_proxy_api">
 <unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
 <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
 </component>
 <component unofficial="yes" name="g711_encoder_interface_proxy_api">
 <unit bldFile="os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
 </component>
-<component unofficial="yes" name="audio_vibra_control_msg_hdlr_api">
-<unit bldFile="os/mm/mm_plat/audio_vibra_control_msg_hdlr_api/group"/>
-</component>
 <component unofficial="yes" name="speech_encoder_config_msg_hdlr_api">
 <unit bldFile="os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
 </component>
 <component unofficial="yes" name="g711_decoder_interface_msg_hdlr_api">
 <unit bldFile="os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
 <unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
 </component>
 <component unofficial="yes" name="ilbc_encoder_interface_proxy_api">
 <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
 </component>
-<component unofficial="yes" name="audio_vibra_control_api">
-<unit bldFile="os/mm/mm_plat/audio_vibra_control_api/group"/>
-</component>
 <component unofficial="yes" name="sbc_encoder_interface_msg_hdlr_api">
 <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
 </component>
 <component unofficial="yes" name="telephony_audio_routing_manager_api">
 <unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
 <component unofficial="yes" name="secure_output_mdf_custom_interface">
 <unit bldFile="os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
 </component>
 <component unofficial="yes" name="wma_decoder_interface_api">
 <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group"/>
-</component>
-<component unofficial="yes" name="audio_vibra_control_proxy_api">
-<unit bldFile="os/mm/mm_plat/audio_vibra_control_proxy_api/group"/>
 </component>
 <component unofficial="yes" name="video_decoder_rotation_mdf_custom_interface">
 <unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
 </component>
 <component unofficial="yes" name="g729_decoder_interface_proxy_api">
 <component unofficial="yes" name="graphics_pub_build" long-name="Graphics Public API Build">
 <!-- <unit bldFile="os/graphics/graphics_pub/group"/> -->
 </component>
 </collection>
 <collection name="graphics_info" long-name="Graphics Info" level="app-if">
+<component unofficial="yes" name="graphicssvs">
+<!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
+<!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
+</component>
 <component unofficial="yes" name="graphics_build" long-name="Graphics Build">
 <unit bldFile="os/graphics/group"/>
 </component>
 </collection>
 <collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
 </component>
 <component name="charconvplugin" long-name="Charconv Plugin">
 <unit bldFile="os/textandloc/charconvfw/charconvplugin/group"/>
 </component>
 <component name="charconv_fw"/>
-<component name="charconvplugins"/>
+<!--Component manually removed and merged to OS-->
+<!--<component name="charconvplugins"/>-->
 </collection>
 <collection name="textandlocutils" level="util">
 <component name="Localizer" long-name="Localizer">
 <unit bldFile="os/textandloc/charconvfw/localizer/group"/>
 </component>
 <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="libxml2_xml_schemas_api">
 <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_schemas_api/group"/>
 </component>
+<component unofficial="yes" name="xmlsrv_plat_build" long-name="XML Services Platform API Build">
+<unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
+</component>
 <component unofficial="yes" name="xml_engine_xpath_api">
 <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/group"/>
 <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="xml_security_engine_utils_api">
 </collection>
 <collection name="xmlsrv_pub" long-name="XML Services Public Interfaces" level="specific">
 <component unofficial="yes" name="xml_engine_dom_api">
 <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/group"/>
 <!-- <unit bldFile="os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
+</component>
+<component unofficial="yes" name="xmlsrv_pub_build" long-name="XML Services Public API Build">
+<unit bldFile="os/xmlsrv/xmlsrv_pub/group"/>
 </component>
 </collection>
 </block>
 <block name="deviceplatformrelease" long-name="Device Platform Release" tech_domain="to" level="services" levels="bld mid top">
 <collection name="S60Extras" long-name="S60 Extras" level="mid">
 <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/group"/> -->
 <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/japan/group"/> -->
 <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/western/group"/> -->
 </component>
 </collection>
-<collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
+<collection name="s60bld">
-<component unofficial="yes" name="s60helps">
+<component unofficial="yes" name="buildplatforms">
-<unit bldFile="os/deviceplatformrelease/s60helps/group"/>
-</component>
-</collection>
-<collection name="s60bld" long-name="S60 Build" level="bld">
-<component unofficial="yes" name="buildplatforms" long-name="Build Platforms">
 <unit bldFile="tools/buildplatforms/group"/>
 </component>
 </collection>
 </block>
 <block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
 <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/group"/>
 <!-- <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/bc/profilesenginewrapperapi/group"/> -->
 </component>
 </collection>
 <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-<component unofficial="yes" name="flashliteapi_3_0">
-<unit bldFile="mw/appsupport/flashliteapi_3_0/group"/>
-</component>
-<component unofficial="yes" name="flashliteapi_3_0_compo">
-<!-- <unit bldFile="mw/appsupport/flashliteapi_3_0/flashliteapi_3_0_compo/group"/> -->
-</component>
 <component unofficial="yes" name="appsupport_build" long-name="Generic Application Support Build">
 <unit bldFile="mw/appsupport/group"/>
 </component>
 </collection>
 </block>
 <block name="securitysrv" long-name="Security Services" tech_domain="se" level="generic" levels="plugin framework server generic specific">
 <collection name="gba" long-name="Generic Boot Architecture" level="specific">
 <component name="uicc" long-name="Uicc">
-<!-- <unit bldFile="mw/securitysrv/gba/uicc/group"/> -->
+<unit bldFile="mw/securitysrv/gba/uicc/group"/>
 </component>
 <component name="bootstrap" long-name="Bootstrap">
-<!-- <unit bldFile="mw/securitysrv/gba/bootstrap/group"/> -->
+<unit bldFile="mw/securitysrv/gba/bootstrap/group"/>
 </component>
 <component name="gbaserver" long-name="GBA Server">
-<!-- <unit bldFile="mw/securitysrv/gba/gbaserver/group"/> -->
+<unit bldFile="mw/securitysrv/gba/gbaserver/group"/>
 </component>
 <component name="gbaapi" long-name="GBA API">
-<!-- <unit bldFile="mw/securitysrv/gba/gbaapi/group"/> -->
+<unit bldFile="mw/securitysrv/gba/gbaapi/group"/>
 </component>
 <component name="gbafilter" long-name="GBA Filter">
-<!-- <unit bldFile="mw/securitysrv/gba/gbafilter/group"/> -->
+<unit bldFile="mw/securitysrv/gba/gbafilter/group"/>
 </component>
 <component unofficial="yes" name="gba_build" long-name="Generic Boot Architecture Build">
 <unit bldFile="mw/securitysrv/gba/group"/>
 </component>
 </collection>
 </block>
 <block name="drm" long-name="DRM" tech_domain="se" level="generic" levels="plugin framework server generic specific">
 <collection name="commondrm" long-name="Common DRM" level="generic">
 <component name="drmencryptor" long-name="DRM Encryptor"/>
 <component name="drmsettingsplugin" long-name="DRM Settings Plugin"/>
-<component name="drmrightsmanagerui" long-name="DRM Rights Manager UI"/>
+<component name="drmrightsmanagerui" long-name="DRM Rights Manager UI">
+<unit bldFile="mw/drm/commondrm/drmrightsmanagerui/help/group"/>
+</component>
 <component name="drmutility" long-name="DRM Utility">
 <unit bldFile="mw/drm/commondrm/drmutility/group"/>
 </component>
 <component name="drmserviceapiwrapper" long-name="DRM Service API Wrapper">
 <unit bldFile="mw/drm/commondrm/drmserviceapiwrapper/group"/>
 <component unofficial="yes" name="drm_license_checker_api">
 <!-- <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/tsrc/group"/> -->
 <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
 </component>
 <component unofficial="yes" name="drm_helper_api">
+<!-- <unit bldFile="mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
 <unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
 </component>
 </collection>
 <collection name="drm_info" long-name="DRM Info" level="specific">
 <component unofficial="yes" name="drm_build" long-name="DRM Build">
 <!-- <unit bldFile="mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
 <unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
 </component>
 <component unofficial="yes" name="roap_api">
 <unit bldFile="mw/drm/drm_plat/roap_api/group"/>
+<!-- <unit bldFile="mw/drm/drm_plat/roap_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="drm_license_manager_api">
 <unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
 </component>
 <component unofficial="yes" name="drm_agents_api">
 <component unofficial="yes" name="drm_service_api">
 <unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
 </component>
 <component unofficial="yes" name="drm_rights_api">
 <unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
+<!-- <unit bldFile="mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="wmdrm_core_api">
 <unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
 </component>
 <component unofficial="yes" name="drm_secondary_display_api">
 </collection>
 <collection name="locationsrv_info" long-name="Location Services Info" level="interface">
 <component unofficial="yes" name="location_notation_preferences_settings_api">
 <unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
 </component>
+<component unofficial="yes" name="location_local_variation_api">
+<unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+</component>
 <component unofficial="yes" name="supl_settings_api">
 <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
 <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
 </component>
 <component unofficial="yes" name="map_and_navigation_api">
 <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/group"/>
 <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="oma_supl_asn_codec_plugin_api">
 <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+<!-- <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="geocoding_api">
 <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
 <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
 <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
 <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
 <!-- <unit bldFile="mw/ipappprotocols/sipplugins/sippsipadapter/tsrc/ut_cwpsipadapter/group"/> -->
 </component>
 </collection>
 <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="server">
-<component unofficial="yes" name="sipconnprovider">
-<!-- <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipconnprovider/group"/> -->
-</component>
-<component unofficial="yes" name="sipsubconnprovider">
-<!-- <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipsubconnprovider/group"/> -->
-</component>
-<component unofficial="yes" name="sipparams">
-<!-- <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipparams/group"/> -->
-</component>
 <component unofficial="yes" name="ipappprotocols_build" long-name="IP App Protocols Build">
 <unit bldFile="mw/ipappprotocols/group"/>
-</component>
-<component unofficial="yes" name="sipstatemachine">
-<!-- <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipstatemachine/group"/> -->
-</component>
-<component unofficial="yes" name="sipdummyprt">
-<!-- <unit bldFile="mw/ipappprotocols/sipconnproviderplugins/sipdummyprt/group"/> -->
 </component>
 </collection>
 <collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="server">
 <component unofficial="yes" name="srtp_api">
 <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
 <component name="vpnapi.dll=binary" long-name="VPN API">
 <unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
 </component>
 </collection>
 <collection name="vpnclient_info" long-name="VPN Client Info" level="api">
+<component unofficial="yes" name="vpnclient_help" long-name="VPN Client Help">
+<unit bldFile="mw/vpnclient/help/group"/>
+</component>
 <component unofficial="yes" name="vpnclient_build" long-name="VPN Client Build">
 <unit bldFile="mw/vpnclient/group"/>
 </component>
 <component unofficial="yes" name="vpnapi">
 <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
 </component>
 <component unofficial="yes" name="phone_client_command_handler_api">
 <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
 </component>
 <component unofficial="yes" name="phone_client_emergency_call_api">
+<!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
 <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
 </component>
 <component unofficial="yes" name="phone_client_messenger_api">
 <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
 </component>
 <unit bldFile="mw/messagingmw/messagingfw/senduiservices/group"/>
 <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/launcher/group"/> -->
 <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/serviceresolver/group"/> -->
 <!-- <unit bldFile="mw/messagingmw/messagingfw/senduiservices/watcher/group"/> -->
 </component>
-<component name="scheduledsendmtm">
+<!--Component manually removed and merged to OS-->
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendexe/group"/>
+<!--<component name="scheduledsendmtm">
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendmtm/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendexe/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/test/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendmtm/group"/>
-</component>
+<unit bldFile="mw/messagingmw/messagingfw/scheduledsendmtm/test/group"/>
-<component name="msgsrvnstore">
+</component>-->
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/group"/>
+<!--Component manually removed and merged to OS-->
-<!-- <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/test/group"/> -->
+<!--<component name="msgsrvnstore">
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/server/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/group"/>
-<!-- <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/server/test/testrom"/> -->
+-  <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/test/group"/>  -
-<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/serverexe/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/server/group"/>
-</component>
+-  <unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/server/test/testrom"/>  -
-<component name="biomsgfw">
+<unit bldFile="mw/messagingmw/messagingfw/msgsrvnstore/serverexe/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bdb"/>
+</component>-->
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bifu"/>
+<!--Component manually removed as empty and name conflicts with an OS component-->
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bioc"/>
+<!--<component name="biomsgfw">
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bios"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bdb"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/biowatchers"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bifu"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bits"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bioc"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/biut"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bios"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/cbcp"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/biowatchers"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/enp"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/bits"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/gfp"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/biut"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/iacp"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/cbcp"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/rom"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/enp"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/t_biomsg/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/gfp"/>
-<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/wapp"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/iacp"/>
-</component>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/rom"/>
-<component name="msgconf"/>
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/t_biomsg/group"/>
-<component name="watcherfw">
+<unit bldFile="mw/messagingmw/messagingfw/biomsgfw/wapp"/>
-<unit bldFile="mw/messagingmw/messagingfw/watcherfw/test/group"/>
+</component>-->
-</component>
+<!--Component manually removed as empty and name conflicts with an OS component-->
-<component name="msgtest">
+<!--<component name="msgconf"/>-->
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/integration/group"/>
+<!--Component manually removed and merged to OS-->
-<!-- <unit bldFile="mw/messagingmw/messagingfw/msgtest/targetautomation"/> -->
+<!--<component name="watcherfw">
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/testsuites/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/watcherfw/test/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/testutils/group"/>
+</component>-->
-<unit bldFile="mw/messagingmw/messagingfw/msgtest/tools/group"/>
+<!--Component manually removed and merged to OS-->
-</component>
+<!--<component name="msgtest">
-<component name="biowatchers">
+<unit bldFile="mw/messagingmw/messagingfw/msgtest/integration/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmanbswatcher/group"/>
+-  <unit bldFile="mw/messagingmw/messagingfw/msgtest/targetautomation"/>  -
-<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmasocketwatcher/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/msgtest/testsuites/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatchervmn/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/msgtest/testutils/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwemt/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/msgtest/tools/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwmt/group"/>
+</component>-->
-<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwpt/group"/>
+<!--Component manually removed and merged to OS-->
-<unit bldFile="mw/messagingmw/messagingfw/biowatchers/test/group"/>
+<!--<component name="biowatchers">
-</component>
+<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmanbswatcher/group"/>
-<component name="sendas">
+<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmasocketwatcher/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/sendas/client/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatchervmn/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/sendas/editutils/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwemt/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/sendas/server/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwmt/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/sendas/test/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/biowatchers/cdmawatcherwpt/group"/>
-</component>
+<unit bldFile="mw/messagingmw/messagingfw/biowatchers/test/group"/>
-<component name="msgurlhandler">
+</component>-->
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/test/group"/>
+<!--Component manually removed and merged to OS-->
-<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/urlhandler/group"/>
+<!--<component name="sendas">
-</component>
+<unit bldFile="mw/messagingmw/messagingfw/sendas/client/group"/>
-<component name="wappushfw">
+<unit bldFile="mw/messagingmw/messagingfw/sendas/editutils/group"/>
-<!-- <unit bldFile="mw/messagingmw/messagingfw/wappushfw/examples/pushapphandlerex"/> -->
+<unit bldFile="mw/messagingmw/messagingfw/sendas/server/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/miscpushmsgutils/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/sendas/test/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/plugins/group"/>
+</component>-->
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/plugins/wapurilookup/group"/>
+<!--Component manually removed and merged to OS-->
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushmsgentry/group"/>
+<!--<component name="msgurlhandler">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushmtm/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/test/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushutils/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/msgurlhandler/urlhandler/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushwatcher/group"/>
+</component>-->
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/roaptcontenthandler/group"/>
+<!--Component manually removed and merged to OS-->
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/rocontenthandler/group"/>
+<!--<component name="wappushfw">
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/rom"/>
+-  <unit bldFile="mw/messagingmw/messagingfw/wappushfw/examples/pushapphandlerex"/>  -
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/sislcontenthandlers/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/miscpushmsgutils/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/sislpushmsgutils/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/plugins/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpush"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/plugins/wapurilookup/group"/>
-<unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpushscriptbased"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushmsgentry/group"/>
-</component>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushmtm/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushutils/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/pushwatcher/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/roaptcontenthandler/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/rocontenthandler/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/rom"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/sislcontenthandlers/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/sislpushmsgutils/group"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpush"/>
+<unit bldFile="mw/messagingmw/messagingfw/wappushfw/tpushscriptbased"/>
+</component>-->
 <component name="suplsmshandler"/>
 <component name="suplwappushhandler"/>
 </collection>
 <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
 <component unofficial="yes" name="send_ui_api">
 <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchoperations/group"/> -->
 <!-- <unit bldFile="mw/imsrv/imservices/searchfeatureplugin/srcsearchprocessor/group"/> -->
 </component>
 <component name="xmppsettingsapi" long-name="XMPP Setting Sapi">
 <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/group"/>
+<!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsapi/tsrc/group"/> -->
 </component>
 <component name="xmppsettingsfetcher" long-name="XMPP Settingsfetcher">
 <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
+<!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
 </component>
 <component name="ossprotocoladaptation" long-name="OSS Protocol Adaptation">
 <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/> -->
 <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
+<!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
 </component>
 <component name="instantmessagingcache" long-name="Instant Messaging Cache">
 <unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
 <!-- <unit bldFile="mw/imsrv/imservices/instantmessagingcache/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="xdmengine_build" long-name="XDM Engine Build">
 <unit bldFile="mw/legacypresence/xdmengine/group"/>
 </component>
 </collection>
 <collection name="xdmsettingsui" long-name="XDM Settings UI" level="ui">
-<component name="xdmsettingsui_help" long-name="Help"/>
+<component name="xdmsettingsui_help" long-name="Help">
+<unit bldFile="mw/legacypresence/xdmsettingsui/help/group"/>
+</component>
 <component unofficial="yes" name="xdmsettingsui_build" long-name="XDM Settings UI Build">
 <unit bldFile="mw/legacypresence/xdmsettingsui/group"/>
 </component>
 </collection>
 <collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
 <component name="simpleplugin.dll=binary">
 <unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
 </component>
 </collection>
 <collection name="presencesettingsui" long-name="Presence Settings UI" level="ui">
-<component name="presencesettingsui_help" long-name="Help"/>
+<component name="presencesettingsui_help" long-name="Help">
+<unit bldFile="mw/legacypresence/presencesettingsui/help/group"/>
+</component>
 <component unofficial="yes" name="presencesettingsui_build" long-name="Presence Settings UI Build">
 <unit bldFile="mw/legacypresence/presencesettingsui/group"/>
 </component>
 </collection>
 <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
 <unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
 </component>
 <component unofficial="yes" name="messaging_connection_manager_api">
 <unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
 </component>
+<component unofficial="yes" name="simple_instant_msg_api">
+<unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+</component>
 <component unofficial="yes" name="simple_settings_api">
 <unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
 </component>
 <component unofficial="yes" name="publisher_api">
 <unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
 <component unofficial="yes" name="loudmouth_test" long-name="Loudmouth Test">
 <!-- <unit bldFile="mw/opensrv/loudmouth/tsrc/group"/> -->
 </component>
 </collection>
 <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<component name="libtelepathy.dll=binary">
+<component unofficial="yes" name="libtelepathy_build" long-name="Telepathy Library Build">
 <unit bldFile="mw/opensrv/libtelepathy/group"/>
+</component>
+<component unofficial="yes" name="libtelepathy_test" long-name="Telepathy Library Test">
+<!-- <unit bldFile="mw/opensrv/libtelepathy/tsrc/group"/> -->
 </component>
 </collection>
 <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
 <component unofficial="yes" name="telepathygabble_build" long-name="Telepathy Gabble Build">
 <unit bldFile="mw/opensrv/telepathygabble/group"/>
 </block>
 <block name="remotemgmt" long-name="Remote Management" tech_domain="dm" level="specific" levels="plugin framework server generic specific">
 <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
 <component name="pnputil" long-name="PnP Util">
 <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/group"/>
+<!-- <unit bldFile="mw/remotemgmt/omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
 </component>
 <component name="provisioning" long-name="provisioning">
 <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/group"/>
 <!-- <unit bldFile="mw/remotemgmt/omaprovisioning/provisioning/tsrc/moduletest/group"/> -->
 </component>
 </collection>
 <collection name="policymanagement" long-name="Policy Management" level="generic">
-<component name="pmdmadapter" long-name="PMDM Adapter"/>
+<component name="pmdmadapter" long-name="PMDM Adapter">
-<component name="dmutilserver" long-name="DM Util Server"/>
+<unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-<component name="policyengine" long-name="Polic Eengine"/>
+</component>
-<component unofficial="yes" name="tarmpolicymng">
+<component name="dmutilserver" long-name="DM Util Server">
-<unit bldFile="mw/remotemgmt/policymanagement/tarmpolicymng/group"/>
+<unit bldFile="mw/remotemgmt/policymanagement/dmutilserver/group"/>
+</component>
+<component name="policyengine" long-name="Polic Eengine">
+<unit bldFile="mw/remotemgmt/policymanagement/policyengine/group"/>
+</component>
+<component unofficial="yes" name="policymanagement_build" long-name="Policy Management Build">
+<unit bldFile="mw/remotemgmt/policymanagement/group"/>
 </component>
 </collection>
 <collection name="syncmlfw" long-name="SyncML Framework" level="server">
 <component name="syncmlfw_common" long-name="Common">
 <unit bldFile="mw/remotemgmt/syncmlfw/common/alerthandler/bld"/>
 <unit bldFile="mw/remotemgmt/syncmlfw/dm/settings/bld"/>
 <unit bldFile="mw/remotemgmt/syncmlfw/dm/syncagent/bld"/>
 <unit bldFile="mw/remotemgmt/syncmlfw/dm/treedbclient/bld"/>
 <unit bldFile="mw/remotemgmt/syncmlfw/dm/treedbhandler/bld"/>
 <unit bldFile="mw/remotemgmt/syncmlfw/dm/treemodule/bld"/>
+<!-- <unit bldFile="mw/remotemgmt/syncmlfw/dm/tsrc/group"/> -->
 <unit bldFile="mw/remotemgmt/syncmlfw/dm/wappushalert/bld"/>
 </component>
 <component name="syncmlnotifier" long-name="SyncML Notifier">
 <unit bldFile="mw/remotemgmt/syncmlfw/syncmlnotifier/group"/>
 </component>
 <component unofficial="yes" name="syncmlfw_build" long-name="SyncML Framework Build">
 <unit bldFile="mw/remotemgmt/syncmlfw/group"/>
 </component>
 </collection>
 <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-<component name="SCP"/>
+<component name="SCP">
-<component name="terminalsecurity_client" long-name="Client"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-<component name="terminalsecurity_server" long-name="Server"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-<component name="tcadapter" long-name="TC Adapter"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-<component unofficial="yes" name="tarmterminalcontrol">
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-<unit bldFile="mw/remotemgmt/terminalsecurity/tarmterminalcontrol/group"/>
+<unit bldFile="mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
+</component>
+<component name="terminalsecurity_client" long-name="Client">
+<unit bldFile="mw/remotemgmt/terminalsecurity/client/group"/>
+</component>
+<component name="terminalsecurity_server" long-name="Server">
+<unit bldFile="mw/remotemgmt/terminalsecurity/server/group"/>
+</component>
+<component name="tcadapter" long-name="TC Adapter">
+<unit bldFile="mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
+</component>
+<component unofficial="yes" name="terminalsecurity_build" long-name="Terminal Security Build">
+<unit bldFile="mw/remotemgmt/terminalsecurity/group"/>
 </component>
 </collection>
 <collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
 <component name="diagframework" long-name="Diagnostics Framework">
 <unit bldFile="mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
 <component unofficial="yes" name="devicediagnosticsfw_build" long-name="Device Diagnostics Framework Build">
 <unit bldFile="mw/remotemgmt/devicediagnosticsfw/group"/>
 </component>
 </collection>
 <collection name="ahle" long-name="Adaptive History List" level="generic">
-<component name="ahleserver" long-name="Adaptive History List Server">
+<component name="ahleserver" long-name="Adaptive History List Server"/>
-<unit bldFile="mw/remotemgmt/ahle/ahleserver/group"/>
+<component name="ahleclient" long-name="Adaptive History List Client"/>
-</component>
-<component name="ahleclient" long-name="Adaptive History List Client">
-<unit bldFile="mw/remotemgmt/ahle/ahleclient/group"/>
-</component>
-<component unofficial="yes" name="ahle_build" long-name="Adaptive History List Build">
-<unit bldFile="mw/remotemgmt/ahle/group"/>
-</component>
 </collection>
 <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
 <component unofficial="yes" name="remotemgmt_build" long-name="Remote Management Build">
 <unit bldFile="mw/remotemgmt/group"/>
 </component>
 <collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
 <component unofficial="yes" name="adaptive_history_list_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
 </component>
 <component unofficial="yes" name="pnpms_utils_api">
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
 </component>
 <component unofficial="yes" name="diagnostics_framework_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
 </component>
 <component unofficial="yes" name="adaptive_history_list_session_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
 </component>
 <component unofficial="yes" name="dm_utils_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="diagnostics_plugin_utility_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
 </component>
 <component unofficial="yes" name="device_management_plugin_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
 </component>
 <component unofficial="yes" name="scp_server_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="syncml_client_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="obex_client_session_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
 </component>
 <component unofficial="yes" name="policy_management_request_api">
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
 </component>
 <component unofficial="yes" name="oma_ds_extensions_api">
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
 </component>
 <component unofficial="yes" name="dm_tree_apis">
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
 </component>
 <component unofficial="yes" name="dm_constant_definitions_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
 </component>
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
 <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="setting_enforcement_info_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="device_management_parameter_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
 </component>
 <component unofficial="yes" name="syncml_alert_api">
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
 </component>
 <component unofficial="yes" name="sync_service_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
 </component>
 <component unofficial="yes" name="policy_management_certificate_api">
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
 </component>
 <component unofficial="yes" name="oma_provisioning_engine_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
 <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="syncml_notifier_roaming_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
 </component>
 <component unofficial="yes" name="terminal_security_device_lock_api">
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
 </component>
 <component unofficial="yes" name="common_agent_util_and_definitions_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
 <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
 <component unofficial="yes" name="syncml_notifier_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
 </component>
 <component unofficial="yes" name="fota_engine_api">
 <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+<!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
 </component>
 </collection>
 </block>
 <block name="networkingdm" long-name="Networking Device Management" tech_domain="dm" level="generic" levels="plugin framework server generic specific">
 <collection name="clientprovisioning" long-name="Client Provisioning" level="specific">
 </collection>
 <collection name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
 <component unofficial="yes" name="upnp_plugin_api">
 <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
 </component>
+<component unofficial="yes" name="upnp_http_transfer_api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_http_transfer_api/group"/>
+</component>
 <component unofficial="yes" name="upnp_media_server_metadata_api">
 <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
 </component>
 <component unofficial="yes" name="upnp_media_server_api">
 <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
 </component>
 <component unofficial="yes" name="upnp_command_api">
 <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+</component>
+<component unofficial="yes" name="upnp_httpserver_api">
+<unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_httpserver_api/group"/>
 </component>
 <component unofficial="yes" name="upnp_common_api">
 <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_common_api/group"/>
 </component>
 <component unofficial="yes" name="upnp_avcp_api">
 <unit bldFile="mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
 </component>
 <component unofficial="yes" name="mulwidgets_build" long-name="MUL Widgets Build">
 <unit bldFile="mw/mmuifw/mulwidgets/group"/>
 </component>
-<component unofficial="yes" name="mulgridwidget">
-<unit bldFile="mw/mmuifw/mulwidgets/mulgridwidget/group"/>
-</component>
-<component unofficial="yes" name="mullistwidget">
-<unit bldFile="mw/mmuifw/mulwidgets/mullistwidget/group"/>
-</component>
 </collection>
 <collection name="osncore" long-name="OSN Core" level="util">
 <component name="osncore" long-name="OSN Core">
 <unit bldFile="mw/mmuifw/osncore/osncore/group"/>
 </component>
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
 </component>
 <component unofficial="yes" name="alf_widgetutils_api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
 </component>
-<component unofficial="yes" name="mul_listwidget_api">
-<unit bldFile="mw/mmuifw/mmuifw_plat/mul_listwidget_api/group"/>
-</component>
 <component unofficial="yes" name="mul_widget_api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
 </component>
 <component unofficial="yes" name="alf_scrollbarwidget_api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
-</component>
-<component unofficial="yes" name="mul_gridwidget_api">
-<unit bldFile="mw/mmuifw/mmuifw_plat/mul_gridwidget_api/group"/>
 </component>
 <component unofficial="yes" name="alf_widgetfactory_api">
 <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
 </component>
 <component unofficial="yes" name="osn_string_api">
 <component unofficial="yes" name="dvrengine_api">
 <unit bldFile="mw/videoutils/videoutils_plat/dvrengine_api/group"/>
 </component>
 <component unofficial="yes" name="videoscheduler_api">
 <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
+<!-- <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="videoutils_plat_build" long-name="Video Utils Platform API Build">
 <unit bldFile="mw/videoutils/videoutils_plat/group"/>
 </component>
 <component unofficial="yes" name="videoconnutility_api">
 <component name="TNEEngine.dll=binary" long-name="TNE Engine">
 <unit bldFile="mw/mmmw/thumbnailengine/group"/>
 </component>
 </collection>
 <collection name="mmfw" long-name="Multimedia Framework" level="framework">
-<component name="gstreamer" long-name="GStreamer">
+<component name="gstreamer" long-name="GStreamer"/>
-<!-- <unit bldFile="mw/mmmw/mmfw/gstreamer/group"/> -->
-<!-- <unit bldFile="mw/mmmw/mmfw/gstreamer/gstreamer_core/tests/group"/> -->
-<!-- <unit bldFile="mw/mmmw/mmfw/gstreamer/gstreamer_core/tsrc/group"/> -->
-<!-- <unit bldFile="mw/mmmw/mmfw/gstreamer/gst_plugins_base/tsrc/group"/> -->
-<!-- <unit bldFile="mw/mmmw/mmfw/gstreamer/tsrc/gstapp/group"/> -->
-<!-- <unit bldFile="mw/mmmw/mmfw/gstreamer/tsrc/gstplayer/group"/> -->
-<!-- <unit bldFile="mw/mmmw/mmfw/gstreamer/tsrc/plugins/gst_plugins_good/group"/> -->
-<!-- <unit bldFile="mw/mmmw/mmfw/gstreamer/tsrc/plugins/gst_plugins_good/gst/wavparse"/> -->
-</component>
 <component name="helix_stub" long-name="Helix Stub">
 <unit bldFile="mw/mmmw/mmfw/helix_stub/group"/>
 </component>
 <component unofficial="yes" name="mmfw_build" long-name="Multimedia Framework Build">
 <unit bldFile="mw/mmmw/mmfw/group"/>
-</component>
-</collection>
-<collection name="mmmiddlewarefws">
-<component unofficial="yes" name="mmutilitylib">
-<!-- <unit bldFile="mw/mmmw/mmmiddlewarefws/mmutilitylib/group"/> -->
 </component>
 </collection>
 <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
 <component unofficial="yes" name="mmmw_build" long-name="Multimedia Middleware Build">
 <unit bldFile="mw/mmmw/group"/>
 </component>
 <component unofficial="yes" name="mmmw_test" long-name="Multimedia Middleware Test">
 <!-- <unit bldFile="mw/mmmw/tsrc/group"/> -->
-</component>
-<component unofficial="yes" name="drmmmfapitestapp">
-<unit bldFile="mw/mmmw/drmmmfapitestapp/group"/>
 </component>
 </collection>
 <collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
 <component unofficial="yes" name="enhanced_media_client_api">
 <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
 <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginitut/group"/> -->
 <!-- <unit bldFile="mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginjp/group"/> -->
 <!-- <unit bldFile="mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/avkonimpl/group"/> -->
 <!-- <unit bldFile="mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/group"/> -->
 </component>
-<component name="frontendprocessor">
+<!--Component manually removed and merged to OS-->
-<unit bldFile="mw/inputmethods/fep/frontendprocessor/test/group"/>
+<!--<component name="frontendprocessor">
-</component>
+<unit bldFile="mw/inputmethods/fep/frontendprocessor/test/group"/>
+</component>-->
 </collection>
 <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
 <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build">
 <unit bldFile="mw/inputmethods/group"/>
 </component>
 <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
 </component>
 <component unofficial="yes" name="ptiengine_key_definations_api">
 <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
 <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
-</component>
-<component unofficial="yes" name="ptiengine_core_api">
-<unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_core_api/group"/>
-<!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_core_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="ptiengine_hwr_api">
 <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
 <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
 </component>
 <!-- <unit bldFile="mw/classicui/psln/pslnslidesetdialog/group"/> -->
 </component>
 <component name="PslnGSPlugin" long-name="Personalizaion GS Plugin">
 <unit bldFile="mw/classicui/psln/pslngsplugin/group"/>
 </component>
-<component name="psln_help" long-name="Help"/>
+<component name="psln_help" long-name="Help">
+<unit bldFile="mw/classicui/psln/help/group"/>
+</component>
 <component unofficial="yes" name="psln_build" long-name="Personalization Build">
 <unit bldFile="mw/classicui/psln/group"/>
 </component>
 </collection>
 <collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
 <!-- <unit bldFile="mw/classicui/uifw/avkon/aknkeyrotator/group"/> -->
 <unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
 <unit bldFile="mw/classicui/uifw/avkon/group"/>
 <unit bldFile="mw/classicui/uifw/avkon/odeconf/group"/>
 <!-- <unit bldFile="mw/classicui/uifw/avkon/prebuilder"/> -->
+<!-- <unit bldFile="mw/classicui/uifw/avkon/tsrc/bc/s60_sdkmcl/bctestmixmcl/group"/> -->
 </component>
 <component name="EikStd" long-name="EikStd">
 <unit bldFile="mw/classicui/uifw/eikstd/group"/>
 </component>
 <component name="AknGlobalUI" long-name="Avkon Global UI">
 <unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group"/>
 </component>
 <component unofficial="yes" name="volume_popup_api">
 <unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group"/>
 </component>
+<component unofficial="yes" name="touch_pane_observer_api">
+<unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+</component>
 <component unofficial="yes" name="indicator_touch_observer_api">
 <unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
 </component>
 <component unofficial="yes" name="custom_cursors_api">
 <unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group"/>
 </component>
 <component unofficial="yes" name="battery_pane_api">
 <unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group"/>
 </component>
 <component unofficial="yes" name="extended_sounds_api">
+<!-- <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/tsrc/group"/> -->
 <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
 </component>
 <component unofficial="yes" name="generic_parameter_api">
 <unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group"/>
 </component>
 </component>
 <component unofficial="yes" name="pointer_event_modifier_api">
 <unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group"/>
 </component>
 <component unofficial="yes" name="personalisation_framework_api">
-<!-- <unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/tsrc/group"/> -->
 <unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group"/>
 </component>
 <component unofficial="yes" name="text_scroller_api">
 <unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group"/>
 </component>
 <unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group"/>
 </component>
 <component unofficial="yes" name="phone_number_text_utilities_api">
 <unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group"/>
 </component>
+<component unofficial="yes" name="touch_pane_api">
+<unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group"/>
+</component>
 <component unofficial="yes" name="themes_settings_api">
 <unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
 </component>
 <component unofficial="yes" name="ganes_api">
 <unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
 </component>
 <component unofficial="yes" name="avkon_status_api">
 <unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
 </component>
 <component unofficial="yes" name="avkon_testability_api">
+<!-- <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/tsrc/group"/> -->
 <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
 </component>
 <component unofficial="yes" name="key_rotator_api">
 <unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group"/>
 </component>
 <component unofficial="yes" name="popup_form_api">
 <unit bldFile="mw/classicui/classicui_plat/popup_form_api/group"/>
 </component>
 </collection>
 <collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
+<component unofficial="yes" name="window_server_event_observer_api">
+<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group"/>
+</component>
+<component unofficial="yes" name="info_popup_note_api">
+<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group"/>
+</component>
+<component unofficial="yes" name="labels_api">
+<unit bldFile="mw/classicui/classicui_pub/labels_api/group"/>
+</component>
+<component unofficial="yes" name="uikon_core_controls">
+<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group"/>
+</component>
+<component unofficial="yes" name="intermediate_state_api">
+<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
+</component>
+<component unofficial="yes" name="common_file_dialogs_api">
+<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group"/>
+</component>
+<component unofficial="yes" name="buttons_api">
+<unit bldFile="mw/classicui/classicui_pub/buttons_api/group"/>
+</component>
+<component unofficial="yes" name="aiw_service_handler_api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group"/>
+</component>
 <component unofficial="yes" name="screen_saver_api">
 <unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group"/>
 </component>
-<component unofficial="yes" name="touch_pane_observer_api">
-<unit bldFile="mw/classicui/classicui_pub/touch_pane_observer_api/group"/>
-</component>
 <component unofficial="yes" name="form_api">
 <unit bldFile="mw/classicui/classicui_pub/form_api/group"/>
 </component>
 <component unofficial="yes" name="generic_button_api">
 <unit bldFile="mw/classicui/classicui_pub/generic_button_api/group"/>
 </component>
+<component unofficial="yes" name="keylock_api">
+<unit bldFile="mw/classicui/classicui_pub/keylock_api/group"/>
+</component>
 <component unofficial="yes" name="dialog_shutter_api">
 <unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group"/>
 </component>
+<component unofficial="yes" name="navigation_pane_api">
+<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group"/>
+</component>
+<component unofficial="yes" name="context_pane_api">
+<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group"/>
+</component>
+<component unofficial="yes" name="ui_framework_definitions_api">
+<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group"/>
+</component>
+<component unofficial="yes" name="aiw_generic_parameter_api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group"/>
+</component>
+<component unofficial="yes" name="slider_api">
+<unit bldFile="mw/classicui/classicui_pub/slider_api/group"/>
+</component>
 <component unofficial="yes" name="application_framework_api">
 <unit bldFile="mw/classicui/classicui_pub/application_framework_api/group"/>
 </component>
+<component unofficial="yes" name="base_controls_api">
+<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group"/>
+</component>
+<component unofficial="yes" name="touch_ui_utilities_api">
+<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group"/>
+</component>
 <component unofficial="yes" name="document_handler_api">
 <unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
 </component>
+<component unofficial="yes" name="ui_framework_utilities_api">
+<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group"/>
+</component>
 <component unofficial="yes" name="tabs_api">
 <unit bldFile="mw/classicui/classicui_pub/tabs_api/group"/>
 </component>
+<component unofficial="yes" name="input_frame_api">
+<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group"/>
+</component>
 <component unofficial="yes" name="indicators_api">
 <unit bldFile="mw/classicui/classicui_pub/indicators_api/group"/>
-</component>
-<component unofficial="yes" name="initialization_api">
-<unit bldFile="mw/classicui/classicui_pub/initialization_api/group"/>
-</component>
-<component unofficial="yes" name="scroller_api">
-<unit bldFile="mw/classicui/classicui_pub/scroller_api/group"/>
-</component>
-<component unofficial="yes" name="setting_pages_api">
-<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group"/>
-</component>
-<component unofficial="yes" name="volume_control_api">
-<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group"/>
-</component>
-<component unofficial="yes" name="notifiers_api">
-<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group"/>
-</component>
-<component unofficial="yes" name="information_preview_popup_api">
-<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group"/>
-</component>
-<component unofficial="yes" name="screen_mode_api">
-<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group"/>
-</component>
-<component unofficial="yes" name="aiw_criteria_api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group"/>
-</component>
-<component unofficial="yes" name="screen_clearer_api">
-<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group"/>
-</component>
-<component unofficial="yes" name="grids_api">
-<unit bldFile="mw/classicui/classicui_pub/grids_api/group"/>
-</component>
-<component unofficial="yes" name="images_api">
-<unit bldFile="mw/classicui/classicui_pub/images_api/group"/>
-</component>
-<component unofficial="yes" name="fonts_api">
-<unit bldFile="mw/classicui/classicui_pub/fonts_api/group"/>
-</component>
-<component unofficial="yes" name="private_ui_framework_api">
-<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group"/>
-</component>
-<component unofficial="yes" name="sounds_api">
-<unit bldFile="mw/classicui/classicui_pub/sounds_api/group"/>
-</component>
-<component unofficial="yes" name="misc_controls_api">
-<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group"/>
-</component>
-<component unofficial="yes" name="animation_api">
-<unit bldFile="mw/classicui/classicui_pub/animation_api/group"/>
-</component>
-<component unofficial="yes" name="server_application_api">
-<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
-</component>
-<component unofficial="yes" name="status_pane_api">
-<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group"/>
-</component>
-<component unofficial="yes" name="info_popup_note_api">
-<unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group"/>
-</component>
-<component unofficial="yes" name="window_server_event_observer_api">
-<unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group"/>
-</component>
-<component unofficial="yes" name="intermediate_state_api">
-<unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
-</component>
-<component unofficial="yes" name="uikon_core_controls">
-<!-- <unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/tsrc/group"/> -->
-<unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group"/>
-</component>
-<component unofficial="yes" name="labels_api">
-<unit bldFile="mw/classicui/classicui_pub/labels_api/group"/>
-</component>
-<component unofficial="yes" name="common_file_dialogs_api">
-<unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group"/>
-</component>
-<component unofficial="yes" name="buttons_api">
-<unit bldFile="mw/classicui/classicui_pub/buttons_api/group"/>
-</component>
-<component unofficial="yes" name="aiw_service_handler_api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group"/>
-</component>
-<component unofficial="yes" name="touch_pane_api">
-<unit bldFile="mw/classicui/classicui_pub/touch_pane_api/group"/>
-</component>
-<component unofficial="yes" name="keylock_api">
-<unit bldFile="mw/classicui/classicui_pub/keylock_api/group"/>
-</component>
-<component unofficial="yes" name="navigation_pane_api">
-<unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group"/>
-</component>
-<component unofficial="yes" name="ui_framework_definitions_api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group"/>
-</component>
-<component unofficial="yes" name="context_pane_api">
-<unit bldFile="mw/classicui/classicui_pub/context_pane_api/group"/>
-</component>
-<component unofficial="yes" name="slider_api">
-<unit bldFile="mw/classicui/classicui_pub/slider_api/group"/>
-</component>
-<component unofficial="yes" name="aiw_generic_parameter_api">
-<unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group"/>
-</component>
-<component unofficial="yes" name="base_controls_api">
-<unit bldFile="mw/classicui/classicui_pub/base_controls_api/group"/>
-</component>
-<component unofficial="yes" name="touch_ui_utilities_api">
-<unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group"/>
-</component>
-<component unofficial="yes" name="ui_framework_utilities_api">
-<unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group"/>
-</component>
-<component unofficial="yes" name="input_frame_api">
-<unit bldFile="mw/classicui/classicui_pub/input_frame_api/group"/>
 </component>
 <component unofficial="yes" name="classicui_pub_test">
 <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/group"/> -->
 <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.2/group"/> -->
 <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
 <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/group"/> -->
 <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
 <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/bctestpane/group"/> -->
 <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
 </component>
+<component unofficial="yes" name="initialization_api">
+<unit bldFile="mw/classicui/classicui_pub/initialization_api/group"/>
+</component>
+<component unofficial="yes" name="scroller_api">
+<unit bldFile="mw/classicui/classicui_pub/scroller_api/group"/>
+</component>
+<component unofficial="yes" name="setting_pages_api">
+<unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group"/>
+</component>
+<component unofficial="yes" name="volume_control_api">
+<unit bldFile="mw/classicui/classicui_pub/volume_control_api/group"/>
+</component>
 <component unofficial="yes" name="hotkeys_api">
 <unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group"/>
 </component>
+<component unofficial="yes" name="notifiers_api">
+<unit bldFile="mw/classicui/classicui_pub/notifiers_api/group"/>
+</component>
+<component unofficial="yes" name="information_preview_popup_api">
+<unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group"/>
+</component>
 <component unofficial="yes" name="error_ui_api">
 <unit bldFile="mw/classicui/classicui_pub/error_ui_api/group"/>
 </component>
+<component unofficial="yes" name="screen_mode_api">
+<unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group"/>
+</component>
+<component unofficial="yes" name="aiw_criteria_api">
+<unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group"/>
+</component>
+<component unofficial="yes" name="popups_api">
+<unit bldFile="mw/classicui/classicui_pub/popups_api/group"/>
+</component>
 <component unofficial="yes" name="choice_list_api">
 <unit bldFile="mw/classicui/classicui_pub/choice_list_api/group"/>
 </component>
-<component unofficial="yes" name="popups_api">
-<unit bldFile="mw/classicui/classicui_pub/popups_api/group"/>
-</component>
 <component unofficial="yes" name="notes_api">
 <unit bldFile="mw/classicui/classicui_pub/notes_api/group"/>
 </component>
+<component unofficial="yes" name="screen_clearer_api">
+<unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group"/>
+</component>
+<component unofficial="yes" name="grids_api">
+<unit bldFile="mw/classicui/classicui_pub/grids_api/group"/>
+</component>
 <component unofficial="yes" name="dialogs_api">
 <unit bldFile="mw/classicui/classicui_pub/dialogs_api/group"/>
 </component>
+<component unofficial="yes" name="images_api">
+<unit bldFile="mw/classicui/classicui_pub/images_api/group"/>
+</component>
+<component unofficial="yes" name="fonts_api">
+<unit bldFile="mw/classicui/classicui_pub/fonts_api/group"/>
+</component>
+<component unofficial="yes" name="calendar_api">
+<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
+</component>
 <component unofficial="yes" name="searchfield_api">
 <unit bldFile="mw/classicui/classicui_pub/searchfield_api/group"/>
 </component>
-<component unofficial="yes" name="calendar_api">
+<component unofficial="yes" name="private_ui_framework_api">
-<unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
+<unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group"/>
+</component>
+<component unofficial="yes" name="sounds_api">
+<unit bldFile="mw/classicui/classicui_pub/sounds_api/group"/>
+</component>
+<component unofficial="yes" name="editors_api">
+<unit bldFile="mw/classicui/classicui_pub/editors_api/group"/>
+</component>
+<component unofficial="yes" name="misc_controls_api">
+<unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group"/>
 </component>
 <component unofficial="yes" name="stylus_popup_menu_api">
 <unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group"/>
 </component>
-<component unofficial="yes" name="editors_api">
-<unit bldFile="mw/classicui/classicui_pub/editors_api/group"/>
-</component>
 <component unofficial="yes" name="queries_api">
 <unit bldFile="mw/classicui/classicui_pub/queries_api/group"/>
 </component>
+<component unofficial="yes" name="title_pane_api">
+<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group"/>
+</component>
 <component unofficial="yes" name="toolbar_api">
 <unit bldFile="mw/classicui/classicui_pub/toolbar_api/group"/>
 </component>
-<component unofficial="yes" name="title_pane_api">
+<component unofficial="yes" name="animation_api">
-<unit bldFile="mw/classicui/classicui_pub/title_pane_api/group"/>
+<unit bldFile="mw/classicui/classicui_pub/animation_api/group"/>
 </component>
 <component unofficial="yes" name="options_menu_api">
-<!-- <unit bldFile="mw/classicui/classicui_pub/options_menu_api/tsrc/group"/> -->
 <unit bldFile="mw/classicui/classicui_pub/options_menu_api/group"/>
 </component>
 <component unofficial="yes" name="lists_api">
 <unit bldFile="mw/classicui/classicui_pub/lists_api/group"/>
+</component>
+<component unofficial="yes" name="server_application_api">
+<unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
+</component>
+<component unofficial="yes" name="status_pane_api">
+<unit bldFile="mw/classicui/classicui_pub/status_pane_api/group"/>
 </component>
 <component unofficial="yes" name="title_pane_touch_observer_api">
 <unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
 </component>
 <component unofficial="yes" name="hierarchical_lists_api">
 <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/qvga_akn_app"/> -->
 <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/qvga_uiaccel"/> -->
 <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/vga3_akn_app"/> -->
 <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/vga3_uiaccel"/> -->
 <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/vga_akn_app"/> -->
+<!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/vga_touch_akn_app"/> -->
 <!-- <unit bldFile="mw/uiresources/layouts/aknlayout2/generated/vga_uiaccel"/> -->
 <unit bldFile="mw/uiresources/layouts/aknlayout2/group"/>
 </component>
 </collection>
 <collection name="locales" long-name="Locales" level="framework">
 <component name="palette" long-name="Palette">
 <!-- <unit bldFile="mw/uiresources/uigraphics/palette/group"/> -->
 </component>
 </collection>
 <collection name="helpthemes" long-name="Help Themes" level="data">
-<component name="helpthemes compo"/>
+<component name="helpthemes compo">
+<unit bldFile="mw/uiresources/helpthemes/group"/>
+</component>
 </collection>
 <collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
 <component name="aknlayoutcompiler compo" long-name="AKN Layout Compiler Component"/>
 </collection>
 <collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
 </component>
 <component unofficial="yes" name="menucontentsrv_build" long-name="Menu Content Service Build">
 <unit bldFile="mw/homescreensrv/menucontentsrv/group"/>
 </component>
 </collection>
-<collection name="homescreensrv_pub" long-name="Home Screen Services Public Interfaces" level="specific">
-<component unofficial="yes" name="hs_widget_publisher_api">
-<unit bldFile="mw/homescreensrv/homescreensrv_pub/hs_widget_publisher_api/group"/>
-</component>
-<component unofficial="yes" name="homescreensrv_pub_build" long-name="Home Screen Services Public API Build">
-<unit bldFile="mw/homescreensrv/homescreensrv_pub/group"/>
-</component>
-</collection>
 <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
 <component unofficial="yes" name="sapi_backstepping">
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
 </component>
 <component unofficial="yes" name="idlefw_api">
 </component>
 <component unofficial="yes" name="ai_content_model_api">
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
 </component>
 <component unofficial="yes" name="action_handler_plugin_api">
+<!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group"/> -->
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group"/>
 </component>
 <component unofficial="yes" name="sapi_menucontent">
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
 </component>
 <component unofficial="yes" name="ai_plugin_management_api">
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
 </component>
 <component unofficial="yes" name="menu_sat_interface_api">
+<!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group"/>
 </component>
 <component unofficial="yes" name="content_harvester_plugin_api">
+<!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/> -->
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group"/>
 </component>
 <component unofficial="yes" name="external_home_screen_api">
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
 </component>
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group"/>
 </component>
 <component unofficial="yes" name="xcfw_api">
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
 </component>
+<component unofficial="yes" name="hs_widget_publisher_api">
+<unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
+<!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/tsrc/group"/> -->
+</component>
 <component unofficial="yes" name="menu_model_api">
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
 </component>
 <component unofficial="yes" name="ai_plugin_information_api">
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
 </component>
 <component unofficial="yes" name="menu_content_service_api">
+<!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/> -->
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group"/>
 </component>
 <component unofficial="yes" name="ai_variation_api">
 <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
 </component>
 </collection>
 <collection name="iaupdate" long-name="IA Update" level="api">
 <component name="IAD">
 <unit bldFile="mw/appinstall/iaupdate/iad/group"/>
 </component>
-<component name="iaupdate_help" long-name="Help"/>
+<component name="iaupdate_help" long-name="Help">
+<unit bldFile="mw/appinstall/iaupdate/help/group"/>
+</component>
 <component unofficial="yes" name="iaupdate_build" long-name="IA Update Build">
 <unit bldFile="mw/appinstall/iaupdate/group"/>
 </component>
 </collection>
 <collection name="appinstall_info" long-name="Application Installation Info" level="api">
 <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
 <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
 </component>
 </collection>
 <collection name="secureswitools">
-<component unofficial="yes" name="swisistools">
+<!--Component manually removed and merged to OS-->
-<!-- <unit bldFile="mw/appinstall/secureswitools/swisistools/test/tinterpretsisinteg/tintsistef"/> -->
+<!--<component name="swisistools">
-</component>
+-  <unit bldFile="mw/appinstall/secureswitools/swisistools/test/tinterpretsisinteg/tintsistef"/>  -
+</component>-->
 </collection>
 </block>
 <block name="serviceapifw" long-name="Service API Framework" tech_domain="rt" level="specific" levels="plugin framework server generic specific">
 <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
 <component name="servicehandler" long-name="Service Handler">
 </component>
 </collection>
 </block>
 <block name="serviceapi" long-name="Service API" tech_domain="rt" level="specific" levels="os mw1 mw2 app">
 <collection name="sapi_applicationmanager" long-name="SAPI Application Manager" level="mw1">
-<component name="appmanagerservice" long-name="App Manager Service">
+<component name="appmanagerservice" long-name="App Manager Service"/>
-<unit bldFile="mw/serviceapi/sapi_applicationmanager/appmanagerservice/group"/>
-</component>
-<component unofficial="yes" name="sapi_applicationmanager_test" long-name="SAPI Application Manager Test">
-<!-- <unit bldFile="mw/serviceapi/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
-<unit bldFile="mw/serviceapi/sapi_applicationmanager/tsrc/group"/>
-</component>
 <component unofficial="yes" name="sapi_applicationmanager_build" long-name="SAPI Application Manager Build">
-<unit bldFile="mw/serviceapi/sapi_applicationmanager/group"/>
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
 </component>
 </collection>
 <collection name="sapi_calendar" long-name="SAPI Calendar" level="app">
-<component name="calendarservice" long-name="Calendar Service">
+<component name="calendarservice" long-name="Calendar Service"/>
-<unit bldFile="mw/serviceapi/sapi_calendar/calendarservice/group"/>
-</component>
-<component unofficial="yes" name="sapi_calendar_test" long-name="SAPI Calendar Test">
-<unit bldFile="mw/serviceapi/sapi_calendar/tsrc/group"/>
-<!-- <unit bldFile="mw/serviceapi/sapi_calendar/tsrc/testing/tcalprovider_combined/group"/> -->
-</component>
 <component unofficial="yes" name="sapi_calendar_build" long-name="SAPI Calendar Build">
-<unit bldFile="mw/serviceapi/sapi_calendar/group"/>
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group"/> -->
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_calendar/group"/>
 </component>
 </collection>
 <collection name="sapi_contacts_vpbk" long-name="SAPI Contacts Vpbk" level="app">
-<component name="contactservice" long-name="Contact Service">
+<component name="contactservice" long-name="Contact Service"/>
-<unit bldFile="mw/serviceapi/sapi_contacts_vpbk/contactservice/group"/>
-</component>
 <component unofficial="yes" name="sapi_contacts_vpbk_build" long-name="SAPI Contacts Vpbk Build">
-<unit bldFile="mw/serviceapi/sapi_contacts_vpbk/group"/>
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-</component>
-<component unofficial="yes" name="sapi_contacts_vpbk_test" long-name="SAPI Contacts Vpbk Test">
-<unit bldFile="mw/serviceapi/sapi_contacts_vpbk/tsrc/group"/>
 </component>
 </collection>
 <collection name="sapi_landmarks" long-name="SAPI Landmarks" level="mw2">
-<component name="landmarksservice" long-name="Landmarks Service">
+<component name="landmarksservice" long-name="Landmarks Service"/>
-<unit bldFile="mw/serviceapi/sapi_landmarks/landmarksservice/group"/>
-</component>
 <component unofficial="yes" name="sapi_landmarks_build" long-name="SAPI Landmarks Build">
-<unit bldFile="mw/serviceapi/sapi_landmarks/group"/>
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
-</component>
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
-<component unofficial="yes" name="sapi_landmarks_test" long-name="SAPI Landmarks Test">
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-<!-- <unit bldFile="mw/serviceapi/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
-<unit bldFile="mw/serviceapi/sapi_landmarks/tsrc/group"/>
-<!-- <unit bldFile="mw/serviceapi/sapi_landmarks/tsrc/dev/group"/> -->
 </component>
 </collection>
 <collection name="sapi_location" long-name="SAPI Location" level="mw2">
-<component name="locationservice" long-name="Location Service">
+<component name="locationservice" long-name="Location Service"/>
-<unit bldFile="mw/serviceapi/sapi_location/locationservice/group"/>
-</component>
-<component unofficial="yes" name="sapi_location_test" long-name="SAPI Location Test">
-<!-- <unit bldFile="mw/serviceapi/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_location/tsrc/dev/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_location/tsrc/testing/performance/pgetloc/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_location/tsrc/testing/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_location/tsrc/testing/performance/pmove/group"/> -->
-<unit bldFile="mw/serviceapi/sapi_location/tsrc/group"/>
-</component>
 <component unofficial="yes" name="sapi_location_build" long-name="SAPI Location Build">
-<unit bldFile="mw/serviceapi/sapi_location/group"/>
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetloc/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/group"/> -->
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
 </component>
 </collection>
 <collection name="sapi_logging" long-name="SAPI Logging" level="app">
-<component name="loggingservice" long-name="Logging Service">
+<component name="loggingservice" long-name="Logging Service"/>
-<unit bldFile="mw/serviceapi/sapi_logging/loggingservice/group"/>
-</component>
-<component unofficial="yes" name="sapi_logging_test" long-name="SAPI Logging Test">
-<unit bldFile="mw/serviceapi/sapi_logging/tsrc/group"/>
-<!-- <unit bldFile="mw/serviceapi/sapi_logging/tsrc/dev/group"/> -->
-</component>
 <component unofficial="yes" name="sapi_logging_build" long-name="SAPI Logging Build">
-<unit bldFile="mw/serviceapi/sapi_logging/group"/>
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/group"/>
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_logging/tsrc/dev/group"/> -->
 </component>
 </collection>
 <collection name="sapi_mediamanagement" long-name="SAPI Media Management" level="mw2">
-<component name="mediamanagementservice" long-name="Media Management Service">
+<component name="mediamanagementservice" long-name="Media Management Service"/>
-<unit bldFile="mw/serviceapi/sapi_mediamanagement/mediamanagementservice/group"/>
-</component>
 <component unofficial="yes" name="sapi_mediamanagement_build" long-name="SAPI Media Management Build">
-<unit bldFile="mw/serviceapi/sapi_mediamanagement/group"/>
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group"/> -->
-</component>
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-<component unofficial="yes" name="sapi_mediamanagement_test" long-name="SAPI Media Management Test">
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group"/> -->
-<unit bldFile="mw/serviceapi/sapi_mediamanagement/tsrc/group"/>
 </component>
 </collection>
 <collection name="sapi_messaging" long-name="SAPI Messaging" level="mw2">
-<component name="messagingservice" long-name="Messaging Service">
+<component name="messagingservice" long-name="Messaging Service"/>
-<unit bldFile="mw/serviceapi/sapi_messaging/messagingservice/group"/>
-</component>
-<component unofficial="yes" name="sapi_messaging_test" long-name="SAPI Messaging Test">
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/send/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
-<unit bldFile="mw/serviceapi/sapi_messaging/tsrc/group"/>
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
-<!-- <unit bldFile="mw/serviceapi/sapi_messaging/tsrc/testing/performance/status/group"/> -->
-</component>
 <component unofficial="yes" name="sapi_messaging_build" long-name="SAPI Messaging Build">
-<unit bldFile="mw/serviceapi/sapi_messaging/group"/>
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/status/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
 </component>
 </collection>
 <collection name="sapi_sensor" long-name="SAPI Sensor" level="mw1">
-<component name="sensorservice" long-name="Sensor Service">
+<component name="sensorservice" long-name="Sensor Service"/>
-<unit bldFile="mw/serviceapi/sapi_sensor/sensorservice/group"/>
-</component>
-<component unofficial="yes" name="sapi_sensor_test" long-name="SAPI Sensor Test">
-<unit bldFile="mw/serviceapi/sapi_sensor/tsrc/group"/>
-</component>
 <component unofficial="yes" name="sapi_sensor_build" long-name="SAPI Sensor Build">
-<unit bldFile="mw/serviceapi/sapi_sensor/group"/>
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_sensor/group"/>
 </component>
 </collection>
 <collection name="sapi_sysinfo" long-name="SAPI Sysinfo" level="mw1">
-<component name="sysinfoservice" long-name="Sysinfo Service">
+<component name="sysinfoservice" long-name="Sysinfo Service"/>
-<unit bldFile="mw/serviceapi/sapi_sysinfo/sysinfoservice/group"/>
-</component>
 <component unofficial="yes" name="sapi_sysinfo_build" long-name="SAPI Sysinfo Build">
-<unit bldFile="mw/serviceapi/sapi_sysinfo/group"/>
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-</component>
-<component unofficial="yes" name="sapi_sysinfo_test" long-name="SAPI Sysinfo Test">
-<unit bldFile="mw/serviceapi/sapi_sysinfo/tsrc/group"/>
 </component>
 </collection>
 <collection name="sapi_serviceregistry" long-name="SAPI Service Registry" level="os">
-<component name="serviceregistryprovider.dll=binary"/>
+<component name="serviceregistryprovider.dll=binary">
+<!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
+<unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
+</component>
 </collection>
 <collection name="serviceapi_info" long-name="Service API Info" level="app">
+<component unofficial="yes" name="serviceproviders">
+<unit bldFile="mw/serviceapi/serviceproviders/group"/>
+</component>
 <component unofficial="yes" name="serviceapi_test" long-name="Service API Test">
 <!-- <unit bldFile="mw/serviceapi/tsrc/group"/> -->
-</component>
-<component unofficial="yes" name="serviceapi_build" long-name="Service API Build">
-<unit bldFile="mw/serviceapi/group"/>
 </component>
 </collection>
 </block>
 <block name="web" long-name="Web" tech_domain="rt" level="specific" levels="plugin framework server generic specific">
 <collection name="browserutilities" long-name="Browser Utilities" level="generic">
 <unit bldFile="mw/web/webengine/device/group"/>
 </component>
 <component name="widgetengine" long-name="Widget Engine">
 <unit bldFile="mw/web/webengine/widgetengine/group"/>
 </component>
-<component name="memoryplugin" long-name="Memory Plugin">
+<!--Component manually removed as empty and name conflicts with another component-->
-<unit bldFile="mw/web/webengine/memoryplugin/group"/>
+<!--<component name="memoryplugin" long-name="Memory Plugin">
-</component>
+<unit bldFile="mw/web/webengine/memoryplugin/group"/>
+</component>-->
 <component name="widgetmemoryplugin" long-name="Widget Memory Plugin">
 <unit bldFile="mw/web/webengine/widgetmemoryplugin/group"/>
 </component>
 <component name="widgetbackuprestore" long-name="Widget Backup Restore">
 <unit bldFile="mw/web/webengine/widgetbackuprestore/group"/>
 <component unofficial="yes" name="third_party_bitmap_palette_api">
 <unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
 </component>
 </collection>
 </block>
-<block name="mobiletv">
-<collection name="mobiletv_info">
-<component unofficial="yes" name="mobiletv_build">
-<unit bldFile="mw/mobiletv/group"/>
-</component>
-</collection>
-</block>
 </layer>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="location" long-name="Location Apps" tech_domain="lo" level="apps" levels="engine ui apps">
 <collection name="landmarksui" long-name="Landmarks UI" level="ui">
-<component name="landmarksui_help" long-name="Help"/>
+<component name="landmarksui_help" long-name="Help">
+<unit bldFile="app/location/landmarksui/help/group"/>
+</component>
 <component name="landmarksui_engine" long-name="Engine">
 <unit bldFile="app/location/landmarksui/engine/group"/>
 </component>
 <component name="uicontrols" long-name="UI Controls">
 <unit bldFile="app/location/landmarksui/uicontrols/group"/>
 <component unofficial="yes" name="basiclocationinfodisplay_build" long-name="Basic Location Info Display Build">
 <unit bldFile="app/location/basiclocationinfodisplay/group"/>
 </component>
 </collection>
 <collection name="eventsui" long-name="Events UI" level="ui">
-<component name="eventsui_help" long-name="Help"/>
+<component name="eventsui_help" long-name="Help">
+<unit bldFile="app/location/eventsui/help/group"/>
+</component>
 <component name="eventsutils" long-name="Events Utils">
 <unit bldFile="app/location/eventsui/eventsutils/group"/>
 </component>
 <component name="eventsengine" long-name="Events Engine">
 <unit bldFile="app/location/eventsui/eventsengine/group"/>
 <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
 <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/tsrc/ut_engine/group"/> -->
 </component>
 <component name="mmshui" long-name="Multimedia Sharing UI">
 <unit bldFile="app/mmsharinguis/mmsharing/mmshui/group"/>
+<unit bldFile="app/mmsharinguis/mmsharing/mmshui/help/group"/>
 <!-- <unit bldFile="app/mmsharinguis/mmsharing/mmshui/tsrc/ut_ui/group"/> -->
 </component>
 <component unofficial="yes" name="mmsharing_build" long-name="MM Sharing Build">
 <unit bldFile="app/mmsharinguis/mmsharing/group"/>
 </component>
 <unit bldFile="app/phone/phoneengine/contacthandling/group"/>
 </component>
 <component name="loghandling" long-name="Log Handling">
 <unit bldFile="app/phone/phoneengine/loghandling/group"/>
 </component>
-<component name="engineinfo" long-name="Engine Info"/>
+<component name="engineinfo" long-name="Engine Info">
+<unit bldFile="app/phone/phoneengine/engineinfo/group"/>
+</component>
 <component name="phonemodel" long-name="Phone Model">
 <unit bldFile="app/phone/phoneengine/phonemodel/group"/>
 </component>
 <component name="servicehandling" long-name="Service Handling">
 <unit bldFile="app/phone/phoneengine/servicehandling/group"/>
 </collection>
 <collection name="poc_info" long-name="PoC Info" level="ui">
 <component unofficial="yes" name="poc_build" long-name="PoC Build">
 <unit bldFile="app/poc/group"/>
 </component>
+<component unofficial="yes" name="poc_help" long-name="PoC Help">
+<unit bldFile="app/poc/help/group"/>
+</component>
 </collection>
 <collection name="poc_plat" long-name="PoC Platform Interfaces" level="ui">
 <component unofficial="yes" name="poc_sessions_api">
 <unit bldFile="app/poc/poc_plat/poc_sessions_api/group"/>
 </component>
 <collection name="settingsuis_info" long-name="Settings UIs Info" level="ui">
 <component unofficial="yes" name="settingsuis_build" long-name="Settings UIs Build">
 <unit bldFile="app/settingsuis/group"/>
 </component>
 <component unofficial="yes" name="default_app_client_api">
+<!-- <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/tsrc/dasclientapitest/group"/> -->
 <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
 </component>
 <component unofficial="yes" name="settingsuis_test" long-name="Settings UIs Test">
 <!-- <unit bldFile="app/settingsuis/tsrc/group"/> -->
 </component>
 </component>
 </collection>
 </block>
 <block name="contentcontrol" long-name="Content Control Daemons" tech_domain="dm" level="services" levels="1 2">
 <collection name="applicationmanagement" long-name="Application Management" level="1">
-<component name="options" long-name="Options"/>
+<component name="options" long-name="Options">
-<component name="applicationmanagement_client" long-name="Client"/>
+<unit bldFile="app/devicecontrol/applicationmanagement/options/group"/>
-<component name="applicationmanagement_server" long-name="Server"/>
+</component>
-<component name="RfsPlugin"/>
+<component name="applicationmanagement_client" long-name="Client">
-<component name="amadapter2" long-name="AM Adapter2"/>
+<unit bldFile="app/devicecontrol/applicationmanagement/client/group"/>
+</component>
+<component name="applicationmanagement_server" long-name="Server">
+<unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
+</component>
+<component name="RfsPlugin">
+<unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
+</component>
+<component name="amadapter2" long-name="AM Adapter2">
+<unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
+</component>
 </collection>
 <collection name="customization" long-name="Customization" level="2">
-<component name="DMUtils"/>
+<component name="DMUtils">
-<component name="UISettingsSrv"/>
+<unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
-<component name="isadapter" long-name="IS Adapter"/>
+</component>
-<component name="supadapter" long-name="SUPAdapter"/>
+<component name="UISettingsSrv">
-<component name="WallpaperAdapter"/>
+<unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
-<component name="OperatorLogoAdapter"/>
+</component>
-<component name="ScreenSaverAdapter"/>
+<component name="isadapter" long-name="IS Adapter">
-<component name="ThemesAdapter"/>
+<unit bldFile="app/devicecontrol/customization/isadapter/bld"/>
-<component name="EmbeddedLinkAdapter"/>
+</component>
+<component name="supadapter" long-name="SUPAdapter">
+<unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
+</component>
+<component name="WallpaperAdapter">
+<unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
+</component>
+<component name="OperatorLogoAdapter">
+<unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
+</component>
+<component name="ScreenSaverAdapter">
+<unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
+</component>
+<component name="ThemesAdapter">
+<unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
+</component>
+<component name="EmbeddedLinkAdapter">
+<unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
+</component>
 </collection>
 <collection name="omads" long-name="OMA DS" level="1">
 <component name="omadsappui" long-name="OMA DS App UI">
 <unit bldFile="app/contentcontrol/omads/omadsappui/group"/>
 </component>
 <component name="omadsextensions" long-name="OMA DS Extensions">
-<!-- <unit bldFile="app/contentcontrol/omads/omadsextensions/adapters/contacts_old/bld"/> -->
+<!-- <unit bldFile="app/contentcontrol/omads/omadsextensions/dsutils/emailxmlutils/bld"/> -->
-<!-- <unit bldFile="app/contentcontrol/omads/omadsextensions/adapters/email/bld"/> -->
 <unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
 </component>
 </collection>
 <collection name="contentcontrol_info" long-name="Content Control Daemons Info" level="2">
 <component unofficial="yes" name="contentcontrol_build" long-name="Content Control Daemons Build">
 <unit bldFile="app/contentcontrol/group"/>
 </component>
 <component unofficial="yes" name="oma_ds_presync_plugin_api">
 <unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
-</component>
-<component unofficial="yes" name="oma_ds_email_client_mtm_api">
-<unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_email_client_mtm_api/group"/>
 </component>
 </collection>
 </block>
 <block name="devicecontrol" long-name="Device Control Daemons" tech_domain="dm" level="services" levels="oma mid app">
 <collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
 </component>
 </collection>
 <collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
 <component name="pnpms" long-name="PnP MS">
 <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/group"/>
+<!-- <unit bldFile="app/devicecontrol/pnpmobileservices/pnpms/tsrc/group"/> -->
 </component>
 </collection>
 <collection name="omacp" long-name="OMA Content Provisioning" level="oma">
 <component name="omacpadapters" long-name="OMA CP Adapters">
 <unit bldFile="app/devicecontrol/omacp/omacpadapters/group"/>
 </collection>
 <collection name="devicecontrol_info" long-name="Device Control Daemons Info" level="app">
 <component unofficial="yes" name="devicecontrol_build" long-name="Device Control Daemons Build">
 <unit bldFile="app/devicecontrol/group"/>
 </component>
-<component unofficial="yes" name="tarmcustomization">
+<component unofficial="yes" name="customization_test">
-<unit bldFile="app/devicecontrol/customization/tarmcustomization/group"/>
+<!-- <unit bldFile="app/devicecontrol/customization/tsrc/tarmcustomization/group"/> -->
 </component>
-<component unofficial="yes" name="tarmappmng">
+<component unofficial="yes" name="applicationmanagement">
-<unit bldFile="app/devicecontrol/applicationmanagement/tarmappmng/group"/>
+<unit bldFile="app/devicecontrol/applicationmanagement/group"/>
+</component>
+<component unofficial="yes" name="customization">
+<unit bldFile="app/devicecontrol/customization/group"/>
+</component>
+<component unofficial="yes" name="applicationmanagement_test">
+<!-- <unit bldFile="app/devicecontrol/applicationmanagement/tsrc/tarmappmng/group"/> -->
 </component>
 </collection>
 </block>
 <block name="printing" long-name="Printing" tech_domain="de" level="services" levels="app">
 <collection name="ImagePrint" long-name="ImagePrint" level="app">
 </component>
 </collection>
 </block>
 <block name="files" long-name="File Manager Apps" tech_domain="pr" level="apps" levels="support apps">
 <collection name="filemanager" long-name="File Manager" level="apps">
-<component name="filemanager_help" long-name="Help"/>
+<component name="filemanager_help" long-name="Help">
+<unit bldFile="app/files/filemanager/help/group"/>
+</component>
 <component unofficial="yes" name="filemanager_build" long-name="File Manager Build">
 <unit bldFile="app/files/filemanager/group"/>
 </component>
 </collection>
 <collection name="filesystemuis" long-name="File System UIs" level="support">
 <component unofficial="yes" name="contactextensions_build" long-name="Contact Extensions Build">
 <unit bldFile="app/contacts/contactextensions/group"/>
 </component>
 </collection>
 <collection name="logsui" long-name="Logs UI" level="ui">
-<component name="logsui_help" long-name="Help"/>
+<component name="logsui_help" long-name="Help">
+<unit bldFile="app/contacts/logsui/help/group"/>
+</component>
 <component name="logsserviceextension" long-name="Logs Service Extension">
 <unit bldFile="app/contacts/logsui/logsserviceextension/group"/>
 </component>
 <component unofficial="yes" name="logsui_build" long-name="Logs UI Build">
 <unit bldFile="app/contacts/logsui/group"/>
 <component name="VirtualPhonebook" long-name="Virtual Phonebook">
 <unit bldFile="app/contacts/phonebookengines/virtualphonebook/group"/>
 <!-- <unit bldFile="app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_selectorfactory/group"/> -->
 <!-- <unit bldFile="app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_strcntanalyzer/group"/> -->
 </component>
-<component name="contactsmodel">
+<!--Component manually removed and merged to OS-->
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/cntmatchlog/group"/> -->
+<!--<component name="contactsmodel">
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/group"/> -->
+-  <unit bldFile="app/contacts/phonebookengines/contactsmodel/cntmatchlog/group"/>  -
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/cntmatchlog/group"/> -->
+-  <unit bldFile="app/contacts/phonebookengines/contactsmodel/group"/>  -
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/fuzztest/group"/> -->
+-  <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/cntmatchlog/group"/>  -
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/cntperftest/group"/> -->
+-  <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/fuzztest/group"/>  -
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/cntperftest/groupsql"/> -->
+<unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/cntperftest/groupsql"/>
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/perffuncsuite/group"/> -->
+<unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/perffuncsuite/groupsql"/>
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/perffuncsuite/groupsql"/> -->
+<unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/tcntpolice/groupsql"/>
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/tcntpolice/group"/> -->
+-  <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/testcontactsuite/group"/>  -
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/tcntpolice/groupsql"/> -->
+<unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/testimpexvcard/groupsql"/>
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/testcontactsuite/group"/> -->
+-  <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/teststartup/group"/>  -
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/testimpexvcard/group"/> -->
+</component>-->
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/testimpexvcard/groupsql"/> -->
-<!-- <unit bldFile="app/contacts/phonebookengines/contactsmodel/tsrc/integration/teststartup/group"/> -->
-</component>
 <component unofficial="yes" name="phonebookengines_build" long-name="Phonebook Engines Build">
 <unit bldFile="app/contacts/phonebookengines/group"/>
 </component>
 </collection>
 <collection name="ccservices" long-name="CC Services" level="services">
 </component>
 <component name="adapters" long-name="Adapters">
 <unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
 </component>
 <component name="PcsAlgorithm" long-name="PCS Algorithm">
-<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/algorithm1/group"/>
+<unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
 </component>
 <component unofficial="yes" name="predictivesearch_build" long-name="Predictive Search Build">
 <unit bldFile="app/contacts/predictivesearch/group"/>
 </component>
 </collection>
 <unit bldFile="app/contacts/group"/>
 </component>
 </collection>
 <collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
 <component unofficial="yes" name="speed_dial_dialogs_api">
+<!-- <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group"/> -->
 <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
 </component>
 <component unofficial="yes" name="phonebook_2_ui_controls_api">
 <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
 </component>
 <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
 </component>
 <component unofficial="yes" name="phonebook_internal_common_api">
 <unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
 </component>
-<component unofficial="yes" name="logs_application_engine_api">
-<unit bldFile="app/contacts/contacts_plat/logs_application_engine_api/group"/>
-</component>
 <component unofficial="yes" name="phonebook_2_ui_utilities_api">
 <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
 </component>
 <component unofficial="yes" name="virtual_phonebook_sim_services_api">
 <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
 <unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
 </component>
 <component unofficial="yes" name="cca_view_plugin_api">
 <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
 <!-- <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/> -->
-</component>
-<component unofficial="yes" name="cms_client_api">
-<unit bldFile="app/contacts/contacts_plat/cms_client_api/group"/>
 </component>
 <component unofficial="yes" name="predictivesearch_adapters_api">
 <unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
 </component>
 <component unofficial="yes" name="cms_contactor_api">
 <component unofficial="yes" name="alarmui_build" long-name="Alarm UI Build">
 <unit bldFile="app/organizer/alarmui/group"/>
 </component>
 </collection>
 <collection name="calendarui" long-name="Calendar UI" level="ui">
-<component name="calendarui_help" long-name="Help"/>
+<component name="calendarui_help" long-name="Help">
+<unit bldFile="app/organizer/calendarui/help/group"/>
+</component>
 <component name="commonutils" long-name="Common Utils">
 <unit bldFile="app/organizer/calendarui/commonutils/group"/>
 </component>
 <component name="globaldata" long-name="Global Data">
 <unit bldFile="app/organizer/calendarui/globaldata/group"/>
 </component>
 <component name="clockui" long-name="Clock UI">
 <unit bldFile="app/organizer/clock2/clockui/group"/>
 <!-- <unit bldFile="app/organizer/clock2/clockui/plugins/datetimeviewplugin/group"/> -->
 </component>
-<component name="clock2_help" long-name="Help"/>
+<component name="clock2_help" long-name="Help">
+<unit bldFile="app/organizer/clock2/help/group"/>
+</component>
 <component unofficial="yes" name="clock2_build" long-name="Clock2 Build">
 <unit bldFile="app/organizer/clock2/group"/>
 </component>
 </collection>
 <collection name="meetingui" long-name="Meeting UI" level="ui">
 <component unofficial="yes" name="meetingui_build" long-name="Meeting UI Build">
 <unit bldFile="app/organizer/meetingui/group"/>
 </component>
 </collection>
 <collection name="notepad" long-name="Notepad" level="ui">
-<component name="notepad_help" long-name="Help"/>
+<component name="notepad_help" long-name="Help">
+<unit bldFile="app/organizer/notepad/help/group"/>
+</component>
 <component name="notepad1" long-name="Notepad1">
 <unit bldFile="app/organizer/notepad/notepad1/group"/>
 <!-- <unit bldFile="app/organizer/notepad/notepad1/syncmladapter/group"/> -->
 </component>
 <component name="txtrecog" long-name="Txt Recog">
 <component unofficial="yes" name="notepad_build" long-name="Notepad Build">
 <unit bldFile="app/organizer/notepad/group"/>
 </component>
 </collection>
 <collection name="searchui" long-name="Search UI" level="ui">
-<component name="searchui_help" long-name="Help"/>
+<component name="searchui_help" long-name="Help">
+<unit bldFile="app/organizer/searchui/help/group"/>
+</component>
 <component name="searchapp" long-name="Search App">
 <unit bldFile="app/organizer/searchui/searchapp/group"/>
 <!-- <unit bldFile="app/organizer/searchui/searchapp/plugins/searchsettingsplugin/group"/> -->
 <!-- <unit bldFile="app/organizer/searchui/searchapp/plugins/srchuisettingsplugin/group"/> -->
 </component>
 <component unofficial="yes" name="calendarengines_build" long-name="Calendar Engines Build">
 <unit bldFile="app/organizer/calendarengines/group"/>
 </component>
 </collection>
 <collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-<component name="mrmailbox" long-name="MR Mailbox"/>
+<component name="mrmailbox" long-name="MR Mailbox">
+<unit bldFile="app/organizer/meetingrequestengines/mrmailbox/group"/>
+</component>
 <component name="mrmailboxutils" long-name="MR Mailbox Utils">
 <unit bldFile="app/organizer/meetingrequestengines/mrmailboxutils/group"/>
 </component>
 </collection>
 <collection name="alarmengines" long-name="Alarm Engines" level="engine">
 <unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
 </component>
 <component unofficial="yes" name="alarm_ui_external_control_api">
 <unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
 </component>
+<component unofficial="yes" name="calendar_custamization_api">
+<unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
+</component>
 <component unofficial="yes" name="searchui_launcher_api">
 <unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
 </component>
 <component unofficial="yes" name="calendar_exporter_api">
 <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
 <!-- <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="meeting_request_mailbox_utilities_api">
 <!-- <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
 <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
+</component>
+<component unofficial="yes" name="calendar_common_utils_api">
+<unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
 </component>
 <component unofficial="yes" name="meeting_request_uids_api">
 <unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
 </component>
 <component unofficial="yes" name="agenda_entry_ui_api">
 </component>
 <component name="smsui" long-name="SMS UI">
 <unit bldFile="app/messaging/mobilemessaging/smsui/group"/>
 <!-- <unit bldFile="app/messaging/mobilemessaging/smsui/viewer"/> -->
 </component>
-<component name="smsmtm">
+<!--Component manually removed as already declared in OS-->
-<unit bldFile="app/messaging/mobilemessaging/smsmtm/multimode/group"/>
+<!--<component name="smsmtm">
-<!-- <unit bldFile="app/messaging/mobilemessaging/smsmtm/test/testrom"/> -->
+<unit bldFile="app/messaging/mobilemessaging/smsmtm/multimode/group"/>
-</component>
+-  <unit bldFile="app/messaging/mobilemessaging/smsmtm/test/testrom"/>  -
+</component>-->
 </collection>
 <collection name="mmsengine" long-name="MMS Engine" level="eng">
 <component name="mmsconninit" long-name="MMS Connection Init">
 <!-- <unit bldFile="app/messaging/mmsengine/mmsconninit/bld"/> -->
 </component>
 <!-- <unit bldFile="app/messaging/mmsengine/applicationadapter/bld"/> -->
 </component>
 <component name="mmscodecclient" long-name="MMS Codec Client">
 <!-- <unit bldFile="app/messaging/mmsengine/mmscodecclient/bld"/> -->
 </component>
-<component name="mmssettings">
+<!--Component manually removed and merged to OS-->
-<unit bldFile="app/messaging/mmsengine/mmssettings/etc"/>
+<!--<component name="mmssettings">
 <unit bldFile="app/messaging/mmsengine/mmssettings/test/group"/>
-</component>
+</component>-->
 <component unofficial="yes" name="mmsengine_build" long-name="MMS Engine Build">
 <unit bldFile="app/messaging/mmsengine/group"/>
 </component>
 </collection>
 <collection name="messagingappbase" long-name="Messaging App Base" level="base">
 <unit bldFile="app/messaging/messagingappbase/smartmessaging/group"/>
 </component>
 <component name="msgeditor" long-name="Messaging Editor">
 <unit bldFile="app/messaging/messagingappbase/msgeditor/group"/>
 </component>
-<component name="smilparser">
+<!--Component manually removed and merged to OS-->
-<unit bldFile="app/messaging/messagingappbase/smilparser/rom"/>
+<!--<component name="smilparser">
-<unit bldFile="app/messaging/messagingappbase/smilparser/smildtd/group"/>
+<unit bldFile="app/messaging/messagingappbase/smilparser/rom"/>
-<unit bldFile="app/messaging/messagingappbase/smilparser/xmldom/group"/>
+<unit bldFile="app/messaging/messagingappbase/smilparser/smildtd/group"/>
-<unit bldFile="app/messaging/messagingappbase/smilparser/xmlparser/group"/>
+<unit bldFile="app/messaging/messagingappbase/smilparser/xmldom/group"/>
-</component>
+<unit bldFile="app/messaging/messagingappbase/smilparser/xmlparser/group"/>
-<component name="obexmtms">
+</component>-->
-<unit bldFile="app/messaging/messagingappbase/obexmtms/btmtm/btclient/group"/>
+<!--Component manually removed and merged to OS-->
-<unit bldFile="app/messaging/messagingappbase/obexmtms/btmtm/btserver/group"/>
+<!--<component name="obexmtms">
-<unit bldFile="app/messaging/messagingappbase/obexmtms/irmtm/irclient/group"/>
+<unit bldFile="app/messaging/messagingappbase/obexmtms/btmtm/btclient/group"/>
-<unit bldFile="app/messaging/messagingappbase/obexmtms/irmtm/irserver/group"/>
+<unit bldFile="app/messaging/messagingappbase/obexmtms/btmtm/btserver/group"/>
-<unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexclient/group"/>
+<unit bldFile="app/messaging/messagingappbase/obexmtms/irmtm/irclient/group"/>
-<unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexserver/group"/>
+<unit bldFile="app/messaging/messagingappbase/obexmtms/irmtm/irserver/group"/>
-<unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexutil/group"/>
+<unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexclient/group"/>
-<unit bldFile="app/messaging/messagingappbase/obexmtms/rom"/>
+<unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexserver/group"/>
-<unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/group"/>
+<unit bldFile="app/messaging/messagingappbase/obexmtms/obexmtm/obexutil/group"/>
-<!-- <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/bluetoothsdpstub/sdp"/> -->
+<unit bldFile="app/messaging/messagingappbase/obexmtms/rom"/>
-<!-- <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/irobexstub/group"/> -->
+<unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/group"/>
-<!-- <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/testutils/msgth/group"/> -->
+-  <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/bluetoothsdpstub/sdp"/>  -
-</component>
+-  <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/irobexstub/group"/>  -
+-  <unit bldFile="app/messaging/messagingappbase/obexmtms/tobexmtm/testutils/msgth/group"/>  -
+</component>-->
 </collection>
 <collection name="email" long-name="Email" level="mail">
 <component name="alwaysonlineemailplugin" long-name="Always Online Mail Plugin">
 <unit bldFile="app/messaging/email/alwaysonlineemailplugin/group"/>
 </component>
 <!-- <unit bldFile="app/messaging/email/imum/utils/group"/> -->
 </component>
 <component name="mail" long-name="Mail">
 <unit bldFile="app/messaging/email/mail/group"/>
 </component>
-<component name="pop3andsmtpmtm">
+<!--Component manually removed and merged to OS-->
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/autosend/group"/>
+<!--<component name="pop3andsmtpmtm">
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/clientmtms/group"/>
+<unit bldFile="app/messaging/email/pop3andsmtpmtm/autosend/group"/>
-<!-- <unit bldFile="app/messaging/email/pop3andsmtpmtm/clientmtms/test/testrom"/> -->
+<unit bldFile="app/messaging/email/pop3andsmtpmtm/clientmtms/group"/>
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/popservermtm/group"/>
+-  <unit bldFile="app/messaging/email/pop3andsmtpmtm/clientmtms/test/testrom"/>  -
-<!-- <unit bldFile="app/messaging/email/pop3andsmtpmtm/popservermtm/test/testrom"/> -->
+<unit bldFile="app/messaging/email/pop3andsmtpmtm/popservermtm/group"/>
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/servermtmutils/group"/>
+-  <unit bldFile="app/messaging/email/pop3andsmtpmtm/popservermtm/test/testrom"/>  -
-<!-- <unit bldFile="app/messaging/email/pop3andsmtpmtm/servermtmutils/test/testrom"/> -->
+<unit bldFile="app/messaging/email/pop3andsmtpmtm/servermtmutils/group"/>
-<unit bldFile="app/messaging/email/pop3andsmtpmtm/smtpservermtm/group"/>
+-  <unit bldFile="app/messaging/email/pop3andsmtpmtm/servermtmutils/test/testrom"/>  -
-<!-- <unit bldFile="app/messaging/email/pop3andsmtpmtm/smtpservermtm/test/testrom"/> -->
+<unit bldFile="app/messaging/email/pop3andsmtpmtm/smtpservermtm/group"/>
-</component>
+-  <unit bldFile="app/messaging/email/pop3andsmtpmtm/smtpservermtm/test/testrom"/>  -
-<component name="imap4mtm">
+</component>-->
-<unit bldFile="app/messaging/email/imap4mtm/imapmailstore/group"/>
+<!--Component manually removed and merged to OS-->
-<unit bldFile="app/messaging/email/imap4mtm/imapofflinecontrol/group"/>
+<!--<component name="imap4mtm">
-<unit bldFile="app/messaging/email/imap4mtm/imapprotocolcontroller/group"/>
+<unit bldFile="app/messaging/email/imap4mtm/imapmailstore/group"/>
-<unit bldFile="app/messaging/email/imap4mtm/imapservermtm/group"/>
+<unit bldFile="app/messaging/email/imap4mtm/imapofflinecontrol/group"/>
-<unit bldFile="app/messaging/email/imap4mtm/imapsession/group"/>
+<unit bldFile="app/messaging/email/imap4mtm/imapprotocolcontroller/group"/>
-<unit bldFile="app/messaging/email/imap4mtm/imapsettings/group"/>
+<unit bldFile="app/messaging/email/imap4mtm/imapservermtm/group"/>
-<unit bldFile="app/messaging/email/imap4mtm/imapsyncmanager/group"/>
+<unit bldFile="app/messaging/email/imap4mtm/imapsession/group"/>
-<unit bldFile="app/messaging/email/imap4mtm/imaptransporthandler/group"/>
+<unit bldFile="app/messaging/email/imap4mtm/imapsettings/group"/>
-<unit bldFile="app/messaging/email/imap4mtm/imaputils/group"/>
+<unit bldFile="app/messaging/email/imap4mtm/imapsyncmanager/group"/>
-</component>
+<unit bldFile="app/messaging/email/imap4mtm/imaptransporthandler/group"/>
+<unit bldFile="app/messaging/email/imap4mtm/imaputils/group"/>
+</component>-->
 </collection>
 <collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
 <component unofficial="yes" name="mms_client_mtm_api">
 <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
 <!-- <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
 </component>
 <component unofficial="yes" name="email_domain_utilities_api">
 <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
+<!-- <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="messaging_build" long-name="Messaging Apps Build">
 <unit bldFile="app/messaging/group"/>
 </component>
 <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test">
 <component unofficial="yes" name="emailuis_build" long-name="Email UIs Build">
 <unit bldFile="app/commonemail/emailuis/group"/>
 </component>
 </collection>
 <collection name="emailhelp" long-name="Email Help" level="support">
-<component name="emailhelp compo"/>
+<component name="emailhelp compo">
+<!-- <unit bldFile="app/commonemail/emailhelp/group"/> -->
+</component>
 </collection>
 <collection name="legacy" long-name="Legacy Email" level="support">
 <component name="iad_rofs" long-name="IAD ROFS"/>
 <component name="ls_pt_hack" long-name="ls pt hack"/>
 <component name="settingwizard" long-name="Setting Wizard"/>
 <component name="vimpstsettings.dll=binary">
 <unit bldFile="app/conversations/uiservicetabsettings/group"/>
 </component>
 </collection>
 <collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-<component name="imstutils_help" long-name="Help"/>
+<component name="imstutils_help" long-name="Help">
+<unit bldFile="app/conversations/imstutils/help/group"/>
+</component>
 <component name="imconnectionprovider" long-name="IM Connection Provider">
 <unit bldFile="app/conversations/imstutils/imconnectionprovider/group"/>
+<!-- <unit bldFile="app/conversations/imstutils/imconnectionprovider/tsrc/imconnectionprovider_test/group"/> -->
 </component>
 <component name="xmppadapter" long-name="XMPP Adapter">
 <unit bldFile="app/conversations/imstutils/xmppadapter/group"/>
+<!-- <unit bldFile="app/conversations/imstutils/xmppadapter/tsrc/xmppadapter_test/group"/> -->
 </component>
 <component name="imconversationview" long-name="IM Conversation View">
 <unit bldFile="app/conversations/imstutils/imconversationview/group"/>
+<!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadaptation/group"/> -->
+<!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/group"/> -->
 </component>
 <component unofficial="yes" name="imstutils_build" long-name="IM Service Tab Utils Build">
 <unit bldFile="app/conversations/imstutils/group"/>
 </component>
 </collection>
 <component name="vimpstutils" long-name="VIMP ST Utilities">
 <unit bldFile="app/conversations/uiservicetab/vimpstutils/group"/>
 </component>
 <component name="vimpststorage" long-name="VIMP ST Storage">
 <unit bldFile="app/conversations/uiservicetab/vimpststorage/group"/>
-<!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/group"/> -->
+<!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactlist_ut/group"/> -->
+<!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactsorter_ut/group"/> -->
+<!-- <unit bldFile="app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontact_ut/group"/> -->
 </component>
 <component name="vimpstengine" long-name="VIMP ST Engine">
 <unit bldFile="app/conversations/uiservicetab/vimpstengine/group"/>
 <!-- <unit bldFile="app/conversations/uiservicetab/vimpstengine/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="im_test" long-name="Instant Messaging Apps Test">
 <!-- <unit bldFile="app/im/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="im_build" long-name="Instant Messaging Apps Build">
 <unit bldFile="app/im/group"/>
+</component>
+<component unofficial="yes" name="im_help" long-name="Instant Messaging Apps Help">
+<unit bldFile="app/im/help/group"/>
 </component>
 </collection>
 <collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
 <component unofficial="yes" name="wv_sap_settings_api">
 <unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
 </component>
 <component name="cameraapp" long-name="Camera Application">
 <!-- <unit bldFile="app/camera/camerauis/cameraapp/generic/camerauiconfigmanager/group"/> -->
 <!-- <unit bldFile="app/camera/camerauis/cameraapp/generic/gscamcorderplugin/group"/> -->
 <unit bldFile="app/camera/camerauis/cameraapp/group"/>
+<!-- <unit bldFile="app/camera/camerauis/cameraapp/help/group"/> -->
 </component>
 </collection>
 <collection name="camera_info" long-name="Camera Apps Info" level="1">
 <component unofficial="yes" name="camera_build" long-name="Camera Apps Build">
 <unit bldFile="app/camera/group"/>
 <component unofficial="yes" name="mediasettings_build" long-name="Media Settings Build">
 <unit bldFile="app/videoplayer/mediasettings/group"/>
 </component>
 </collection>
 <collection name="videoplayer_info" long-name="Video Player Apps Info" level="apps">
+<component unofficial="yes" name="videoplayer_help" long-name="Video Player Apps Help">
+<unit bldFile="app/videoplayer/help/group"/>
+</component>
 <component unofficial="yes" name="videoplayer_test" long-name="Video Player Apps Test">
 <!-- <unit bldFile="app/videoplayer/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="videoplayer_build" long-name="Video Player Apps Build">
 <unit bldFile="app/videoplayer/group"/>
 </component>
 </collection>
 </block>
 <block name="photos" long-name="Photos" tech_domain="ma" level="apps" levels="support fw ui app">
 <collection name="photosgallery" long-name="Photos Gallery" level="app">
-<component name="photosgallery_help" long-name="Help"/>
+<component name="photosgallery_help" long-name="Help">
+<unit bldFile="app/photos/photosgallery/help/group"/>
+</component>
 <component name="logging" long-name="Logging">
 <!-- <unit bldFile="app/photos/photosgallery/logging/app/group"/> -->
 <unit bldFile="app/photos/photosgallery/logging/group"/>
 </component>
 <component name="photosgallery_common" long-name="Common">
 <component name="collectionframework" long-name="Collection Framework">
 <unit bldFile="app/photos/photosgallery/collectionframework/group"/>
 <!-- <unit bldFile="app/photos/photosgallery/collectionframework/plugins/glxcollectionpluginalbums/group"/> -->
 </component>
 <component name="viewframework" long-name="View Framework">
+<!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerbase/tsrc/group"/> -->
+<!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/group"/> -->
+<!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/t_glxupnprenderer/group"/> -->
+<!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/group"/> -->
+<!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/t_cglxaiwservicehandler/group"/> -->
+<!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/t_glxcommandhandlerback/group"/> -->
+<!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/tsrc/group"/> -->
+<!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut_commandhandlerdrm/group"/> -->
+<!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut_commandhandlermoreinfo/group"/> -->
+<!-- <unit bldFile="app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut__commandhandlermarking/group"/> -->
 <unit bldFile="app/photos/photosgallery/viewframework/group"/>
 <!-- <unit bldFile="app/photos/photosgallery/viewframework/plugins/metadataviewplugin/group"/> -->
 <!-- <unit bldFile="app/photos/photosgallery/viewframework/views/listview/group"/> -->
 <!-- <unit bldFile="app/photos/photosgallery/viewframework/views/metadataview/group"/> -->
 <!-- <unit bldFile="app/photos/photosgallery/viewframework/views/viewbase/group"/> -->
 </component>
 <component name="gallery" long-name="Gallery">
 <unit bldFile="app/photos/photosgallery/gallery/group"/>
 </component>
 <component name="slideshow" long-name="Slideshow">
+<!-- <unit bldFile="app/photos/photosgallery/slideshow/engine/tsrc/group"/> -->
 <unit bldFile="app/photos/photosgallery/slideshow/group"/>
 </component>
 <component name="contentharvesterplugin" long-name="Content Harvester Plugin">
 <unit bldFile="app/photos/photosgallery/contentharvesterplugin/group"/>
 </component>
 <component name="photossuite" long-name="Photos Suite">
 <unit bldFile="app/photos/photosgallery/photossuite/group"/>
 </component>
-<component name="memoryplugin" long-name="Memory Plugin"/>
+<!--Component manually removed as empty and name conflicts with another component-->
+<!--<component name="memoryplugin" long-name="Memory Plugin">
+<unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
+</component>-->
 <component unofficial="yes" name="icons">
 <unit bldFile="app/photos/photosgallery/icons"/>
 </component>
 <component unofficial="yes" name="photosgallery_build" long-name="Photos Gallery Build">
 <unit bldFile="app/photos/photosgallery/group"/>
 </component>
 <component unofficial="yes" name="collection_plugins_api">
 <unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
 </component>
 <component unofficial="yes" name="controllers_collection_api">
+<!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ui_metadatadialog/group"/> -->
+<!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group"/> -->
+<!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group"/> -->
 <unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
 </component>
 <component unofficial="yes" name="photos_plat_build" long-name="Photos Platform API Build">
 <unit bldFile="app/photos/photos_plat/group"/>
 </component>
 <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
 </component>
 <component unofficial="yes" name="mpxmyvideoscollection_build" long-name="MPX My Videos Collection Build">
 <unit bldFile="app/videocenter/mpxmyvideoscollection/group"/>
 </component>
+<component unofficial="yes" name="mpxmyvideoscollection_test" long-name="MPX My Videos Collection Test">
+<!-- <unit bldFile="app/videocenter/mpxmyvideoscollection/tsrc/group"/> -->
+</component>
 </collection>
 <collection name="nsmyvideosview" long-name="NS My Videos View" level="app">
 <component name="hgmyvideos" long-name="HG My Videos">
 <unit bldFile="app/videocenter/nsmyvideosview/hgmyvideos/group"/>
 </component>
 <component name="hgmyvideosplugin" long-name="HG My Videos Plugin">
 <unit bldFile="app/videocenter/nsmyvideosview/hgmyvideosplugin/group"/>
 </component>
 <component name="nsmyvideos" long-name="NS Myvideos">
-<unit bldFile="app/videocenter/nsmyvideosview/nsmyvideos/group"/>
+<!-- <unit bldFile="app/videocenter/nsmyvideosview/nsmyvideos/group"/> -->
 </component>
 <component name="nsmyvideosplugin" long-name="NS Myvideos Plugin">
-<unit bldFile="app/videocenter/nsmyvideosview/nsmyvideosplugin/group"/>
+<!-- <unit bldFile="app/videocenter/nsmyvideosview/nsmyvideosplugin/group"/> -->
 </component>
 </collection>
 <collection name="vccommon" long-name="Video Center Common" level="eng">
 <component name="vccommon_utils" long-name="Utilities">
 <unit bldFile="app/videocenter/vccommon/utils/group"/>
 </component>
 <component name="notifierplugins" long-name="Notifier Plugins">
 <unit bldFile="app/videocenter/vccommon/notifierplugins/notifierplugin/group"/>
 <unit bldFile="app/videocenter/vccommon/notifierplugins/vcxnotifier/group"/>
 </component>
-<component name="vccommon_help" long-name="Help"/>
+<component name="vccommon_help" long-name="Help">
-<component unofficial="yes" name="help_rel6">
+<unit bldFile="app/videocenter/vccommon/help/group"/>
-<unit bldFile="app/videocenter/vccommon/help_rel6/group"/>
 </component>
 <component unofficial="yes" name="sis">
 <!-- <unit bldFile="app/videocenter/vccommon/sis"/> -->
 </component>
 <component unofficial="yes" name="vccommon_build" long-name="Video Center Common Build">
 <component name="vcnsahplugin" long-name="VCNS Action Handler Plugin">
 <unit bldFile="app/videocenter/vcnsuis/vcnsahplugin/group"/>
 </component>
 <component name="vcnsvodui" long-name="VCNS VOD UI">
 <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/plugins/hgvodplugin/group"/>
-<unit bldFile="app/videocenter/vcnsuis/vcnsvodui/plugins/vcnsvodplugin/group"/>
+<!-- <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/plugins/vcnsvodplugin/group"/> -->
 <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/views/hgvodui/group"/>
-<unit bldFile="app/videocenter/vcnsuis/vcnsvodui/views/vcnsvodui/group"/>
+<!-- <unit bldFile="app/videocenter/vcnsuis/vcnsvodui/views/vcnsvodui/group"/> -->
 </component>
 <component name="vcnslivetv" long-name="VCNS Live TV">
 <unit bldFile="app/videocenter/vcnsuis/vcnslivetv/remindernotifier/group"/>
 </component>
 <component name="vcnschplugin" long-name="VCNS Content Harvester Plugin">
 <component name="mpxvisualizationplugins" long-name="MPX Visualization Plugins">
 <unit bldFile="app/musicplayer/musicvisualization/mpxvisualizationplugins/group"/>
 </component>
 </collection>
 <collection name="mpxmusicplayer" long-name="MPX Music Player" level="apps">
-<component name="mpxmusicplayer_help" long-name="Help"/>
+<component name="mpxmusicplayer_help" long-name="Help">
+<unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
+</component>
 <component name="mpxmusicplayer_commonui" long-name="Common UI">
 <unit bldFile="app/musicplayer/mpxmusicplayer/commonui/group"/>
 </component>
 <component name="activeidle" long-name="Active Idle">
 <unit bldFile="app/musicplayer/mpxmusicplayer/activeidle/group"/>
 <block name="voicerec" long-name="Voice Recorder Apps" tech_domain="ma" level="apps" levels="empty 1">
 <collection name="voicerecorder" long-name="Voice Recorder" level="1">
 <component name="gsplugin" long-name="GS Plugin">
 <!-- <unit bldFile="app/voicerec/voicerecorder/gsplugin/group"/> -->
 </component>
-<component name="voicerecorder_help" long-name="Help"/>
+<component name="voicerecorder_help" long-name="Help">
+<unit bldFile="app/voicerec/voicerecorder/help/group"/>
+</component>
 <component unofficial="yes" name="voicerecorder_build" long-name="Voice Recorder Build">
 <unit bldFile="app/voicerec/voicerecorder/group"/>
 </component>
 </collection>
 <collection name="voicerec_info" long-name="Voice Recorder Apps Info" level="1">
 </component>
 </collection>
 </block>
 <block name="imgvieweruis" long-name="Image Viewer UIs" tech_domain="ma" level="services" levels="app">
 <collection name="imageviewer" long-name="Image Viewer" level="app">
-<component name="imageviewer_help" long-name="Help"/>
+<component name="imageviewer_help" long-name="Help">
+<unit bldFile="app/imgvieweruis/imageviewer/help/group"/>
+</component>
 <component unofficial="yes" name="imageviewer_build" long-name="Image Viewer Build">
 <unit bldFile="app/imgvieweruis/imageviewer/group"/>
 </component>
 </collection>
 <collection name="imgvieweruis_info" long-name="Image Viewer UIs Info" level="app">
 </component>
 <component name="exths" long-name="ExtHS">
 <unit bldFile="app/homescreen/idlehomescreen/exths/group"/>
 </component>
 <component name="activeidle3" long-name="Active Idle 3">
-<!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/themes/buzzidle/install/softindicator/group"/> -->
+<!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/data/group"/> -->
 <unit bldFile="app/homescreen/idlehomescreen/activeidle3/group"/>
 <!-- <unit bldFile="app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/group"/> -->
 </component>
 <component name="hsplugins" long-name="HS Plugins">
 <unit bldFile="app/homescreen/idlehomescreen/hsplugins/group"/>
+<!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/qhd_tch/organizer_2001f481/group"/> -->
+<!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001f48d/group"/> -->
+<!-- <unit bldFile="app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001fdba/group"/> -->
 </component>
 </collection>
 <collection name="menufw" long-name="Menu Framework" level="fw">
 <component name="hierarchynavigator" long-name="Hierarchy Navigator">
 <unit bldFile="app/homescreen/menufw/hierarchynavigator/group"/>
 </component>
 </collection>
 <collection name="homescreen_info" long-name="Home Screen Apps Info" level="apps">
 <component unofficial="yes" name="homescreen_build" long-name="Home Screen Apps Build">
 <unit bldFile="app/homescreen/group"/>
+</component>
+<component unofficial="yes" name="homescreen_test" long-name="Home Screen Apps Test">
+<!-- <unit bldFile="app/homescreen/tsrc/group"/> -->
+</component>
+</collection>
+<collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
+<component unofficial="yes" name="menu_settings_api">
+<unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
 </component>
 </collection>
 </block>
 <block name="graphicsuis" long-name="Graphics UIs" tech_domain="ui" level="services" levels="util ui">
 <collection name="svgtviewer" long-name="SVGT Viewer" level="ui">
 </collection>
 <collection name="profile_info" long-name="Profile Info" level="app">
 <component unofficial="yes" name="profile_test" long-name="Profile Test">
 <!-- <unit bldFile="app/profile/tsrc/group"/> -->
 </component>
+<component unofficial="yes" name="profile_help" long-name="Profile Help">
+<unit bldFile="app/profile/help/group"/>
+</component>
 <component unofficial="yes" name="profile_build" long-name="Profile Build">
 <unit bldFile="app/profile/group"/>
 </component>
 </collection>
 </block>
 <unit bldFile="app/speechsrv/srsf/ttsutility/group"/>
 </component>
 <component name="speechsynthesis" long-name="Speech Synthesis">
 <unit bldFile="app/speechsrv/srsf/speechsynthesis/client/group"/>
 <unit bldFile="app/speechsrv/srsf/speechsynthesis/server/group"/>
-<!-- <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/speechsynthesistest/group"/> -->
+<unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/speechsynthesistest/group"/>
 <!-- <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/testapplication/group"/> -->
 <!-- <unit bldFile="app/speechsrv/srsf/speechsynthesis/tsrc/texttospeech/group"/> -->
 </component>
 <component name="devasr" long-name="Audio Recording and Speech Recognition">
 <unit bldFile="app/speechsrv/srsf/devasr/group"/>
 <unit bldFile="app/speechsrv/srsf/profileobserverplugin/group"/>
 </component>
 <component unofficial="yes" name="srsf_build" long-name="Speech Recognition and Synthesis Framework Build">
 <unit bldFile="app/speechsrv/srsf/group"/>
 </component>
-<component unofficial="yes" name="srsf_test" long-name="Speech Recognition and Synthesis Framework Test">
-<!-- <unit bldFile="app/speechsrv/srsf/tsrc/public/basic/group"/> -->
-</component>
 </collection>
 <collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
 <component unofficial="yes" name="voice_commands_resource_header_api">
 <unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
 </component>
 <component unofficial="yes" name="ui_voice_recognition_api">
 <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
-<!-- <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/tsrc/group"/> -->
 </component>
 <component unofficial="yes" name="nss_tts_common_api">
 <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
 </component>
 <component unofficial="yes" name="nss_devasr_api">
 <component unofficial="yes" name="nss_tts_utility_api">
 <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
 </component>
 </collection>
 <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui">
+<component unofficial="yes" name="speechsrv_test" long-name="Speech Recognition UIs Test">
+<!-- <unit bldFile="app/speechsrv/tsrc/group"/> -->
+</component>
 <component unofficial="yes" name="speechsrv_build" long-name="Speech Recognition UIs Build">
 <unit bldFile="app/speechsrv/group"/>
 </component>
 </collection>
 </block>
 <component unofficial="yes" name="browserplugins_build" long-name="Browser Plugins Build">
 <unit bldFile="app/webuis/browserplugins/group"/>
 </component>
 </collection>
 <collection name="pushmtm" long-name="Push MTM" level="plugin">
-<component name="pushmtm_help" long-name="Help"/>
+<component name="pushmtm_help" long-name="Help">
+<unit bldFile="app/webuis/pushmtm/help/group"/>
+</component>
 <component name="Plugins">
 <unit bldFile="app/webuis/pushmtm/plugins/group"/>
 </component>
 <component unofficial="yes" name="pushmtm_build" long-name="Push MTM Build">
 <unit bldFile="app/webuis/pushmtm/group"/>
 <component name="jarfiledecoder" long-name="JAR File Decoder"/>
 <component name="javareader" long-name="Java Reader"/>
 <component name="javapackagelookup" long-name="Java Package Lookup"/>
 <component name="javautils_common" long-name="Common"/>
 <component name="integrityserver" long-name="Integrity Server"/>
-<component name="javadrmutils" long-name="Java DRM Utils"/>
+<!--component manually moved to javautils collection-->
+<!--<component name="javadrmutils" long-name="Java DRM Utils"/>-->
 <component name="javarecognizer" long-name="Java Recognizer"/>
 <component name="iconconverter" long-name="Icon Converter"/>
 <component name="adt" long-name="ADT"/>
-<component name="javaenvinfo" long-name="Java Environment Info"/>
+<!--component manually moved to javautils collection-->
+<!--<component name="javaenvinfo" long-name="Java Environment Info"/>-->
 </collection>
 <collection name="java_stubs" long-name="Java Stubs" level="util">
-<component name="javadrmutils" long-name="Java DRM Utils">
+<!--component manually moved to javautils collection-->
-<unit bldFile="app/java/java_stubs/javadrmutils/group"/>
+<!--<component name="javadrmutils" long-name="Java DRM Utils">
-</component>
+<unit bldFile="app/java/java_stubs/javadrmutils/group"/>
-<component name="javaenvinfo" long-name="Java Environment Info">
+</component>-->
-<unit bldFile="app/java/java_stubs/javaenvinfo/group"/>
+<!--component manually moved to javautils collection-->
-</component>
+<!--<component name="javaenvinfo" long-name="Java Environment Info">
+<unit bldFile="app/java/java_stubs/javaenvinfo/group"/>
+</component>-->
 <component name="javaregistry" long-name="Java Registry">
 <unit bldFile="app/java/java_stubs/javaregistry/clientserver/client/group"/>
 </component>
 <component unofficial="yes" name="java_stubs_build">
 <unit bldFile="app/java/java_stubs/group"/>
 <component unofficial="yes" name="csxhelp_build" long-name="Context Sensitive Extended Help Build">
 <unit bldFile="app/helps/csxhelp/group"/>
 </component>
 </collection>
 </block>
-<block name="techview">
-<collection name="techview_info">
-<component unofficial="yes" name="connectivityfw">
-<!-- <unit bldFile="app/techview/connectivityapps/connectivityfw/bal/plugins/mrouter3/group"/> -->
-</component>
-</collection>
-</block>
 </layer>
 </systemModel>
 </SystemDefinition>

changeset 130	40c430068ab4
parent 105	609bd3bcfef4
child 131	2be41f6d21e7