foundation/sysdefs/system_model_s60.xml
changeset 131 2be41f6d21e7
parent 130 40c430068ab4
child 155 4e5a319d2a62
--- a/foundation/sysdefs/system_model_s60.xml	Wed Jul 22 16:40:55 2009 +0100
+++ b/foundation/sysdefs/system_model_s60.xml	Fri Jul 24 17:20:56 2009 +0100
@@ -15,7 +15,7 @@
 Tools			to
 Operator Complementary Packages		ocp
 -->
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation">
    <block name="stubs" long-name="Stubs" tech_domain="hb" levels="adaptation plugin mid engine">
@@ -31,30 +31,30 @@
      </component>
     </collection>
     <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-     <component name="drm_stubs compo" long-name="DRM Stubs Component">
+     <component name="drm_stubs_build" long-name="DRM Stubs Component">
       <unit bldFile="adaptation/stubs/drm_stubs/group"/>
      </component>
     </collection>
     <collection name="ptit9core_stub" long-name="PTI T9 Core Stub" level="plugin">
-     <component name="ptit9core_stub compo" long-name="PTI T9 Core Stub Component"/>
+     <component name="ptit9core_stub_build" long-name="PTI T9 Core Stub Component"/>
     </collection>
     <collection name="btaudioadaptation_stub" long-name="BT Audio Adaptation Stub" level="adaptation">
-     <component name="btaudioadaptation_stub.dll=binary">
+     <component name="btaudioadaptation_stub_build">
       <unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
      </component>
     </collection>
     <collection name="posmsgpluginreferenceimpl" long-name="Pos Msg Plugin Reference Implementation" level="plugin">
-     <component name="eposomasuplposrefapp.dll=binary">
+     <component name="eposomasuplposrefapp">
       <unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
      </component>
     </collection>
     <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-     <component name="AsnImplementation.dll=binary" long-name="ASN Imple­ment­ation">
+     <component name="asnimplementation" long-name="ASN Imple­ment­ation">
       <unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
      </component>
     </collection>
     <collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-     <component name="power_save_display_mode_stub.dll=binary">
+     <component name="power_save_display_mode_stub_build">
       <unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
      </component>
     </collection>
@@ -100,7 +100,7 @@
      <component name="featuremanagerstub" long-name="Feature Manager Stub">
       <unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group"/>
      </component>
-     <component name="TVOutConfig" long-name="TVOut Config">
+     <component name="tvoutconfig" long-name="TVOut Config">
       <unit bldFile="adaptation/stubs/systemswstubs/tvoutconfig/group"/>
      </component>
      <component name="hwrmstubplugins" long-name="HWRM Stub Plugins">
@@ -129,17 +129,17 @@
      </component>
     </collection>
     <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-     <component name="tactileclickplugin.dll=binary">
+     <component name="tactileclickplugin_build">
       <unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
      </component>
     </collection>
     <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-     <component name="wlanhwinit.dll=binary">
+     <component name="wlanhwinit">
       <unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
      </component>
     </collection>
     <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-     <component name="ocrsrv.dll=binary">
+     <component name="ocrsrv">
       <unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
      </component>
     </collection>
@@ -152,19 +152,16 @@
       <unit bldFile="os/ossrv/utilitylibraries/libutils/group"/>
       <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/group"/>
       <!-- <unit bldFile="os/ossrv/utilitylibraries/libutils/tsrc/nft/group"/> -->
-      <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
      </component>
     </collection>
     <collection name="ofdbus" long-name="OF Dbus" level="utilities">
      <component name="dbus" long-name="Dbus">
       <unit bldFile="os/ossrv/ofdbus/dbus/group"/>
       <unit bldFile="os/ossrv/ofdbus/dbus/tsrc/group"/>
-      <unit bldFile="os/ossrv/ossrv_pub/dbus/group"/>
      </component>
      <component name="dbus-glib" long-name="Dbus glib">
       <unit bldFile="os/ossrv/ofdbus/dbus-glib/group"/>
       <unit bldFile="os/ossrv/ofdbus/dbus-glib/tsrc/group"/>
-      <unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
      </component>
      <component unofficial="yes" name="ofdbus_build" long-name="OF Dbus Build">
       <unit bldFile="os/ossrv/ofdbus/group"/>
@@ -172,12 +169,12 @@
      <component unofficial="yes" name="ofdbus_test" long-name="OF Dbus Test">
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/idle_daemon_run/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages/group"/> -->
-      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_file_send/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages1/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/stif_glib_1_simple_message/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/file_transfer_time/group"/> -->
       <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/g_n_messages1/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
      </component>
     </collection>
     <collection name="glib" long-name="Glib" level="utilities">
@@ -221,11 +218,11 @@
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/twsd_manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/ood_manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/stlport/manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/io_manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
-      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/bc/group"/> -->
       <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/boost_test/graph/manual/group"/> -->
+      <!-- <unit bldFile="os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
       <unit bldFile="os/ossrv/stdcpp/tsrc/group"/>
      </component>
     </collection>
@@ -241,275 +238,18 @@
      <component unofficial="yes" name="ossrv_test" long-name="Generic OS Services Test">
       <!-- <unit bldFile="os/ossrv/tsrc/group"/> -->
      </component>
+     <component unofficial="yes" name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" class="api">
+      <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
+     </component>
      <component unofficial="yes" name="ossrv_build" long-name="Generic OS Services Build">
       <unit bldFile="os/ossrv/group"/>
      </component>
-    </collection>
-    <collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
-     <component unofficial="yes" name="standard_compressiondecompression_api">
-      <unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_memory_allocation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-     </component>
-     <component unofficial="yes" name="glib_io_channels">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-     </component>
-     <component unofficial="yes" name="cryptogaphy_related_api">
-      <unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_automatic_string_completion">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-     </component>
-     <component unofficial="yes" name="glib_strings">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-     </component>
-     <component unofficial="yes" name="glib_string_utility_functions">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_message_logging">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-     </component>
-     <component unofficial="yes" name="localization_function_api">
-      <unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
-     </component>
-     <component unofficial="yes" name="gparamspec">
-      <unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-     </component>
-     <component unofficial="yes" name="wide_character_classapis">
-      <unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
-     </component>
-     <component unofficial="yes" name="glib_balanced_binary_trees">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-     </component>
-     <component unofficial="yes" name="glib_hook_functions">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_generic_values">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-     </component>
-     <component unofficial="yes" name="glib_varargs_value_collection">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-     </component>
-     <component unofficial="yes" name="glib_caches">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-     </component>
-     <component unofficial="yes" name="no_namespace_headers">
-      <unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
-     </component>
-     <component unofficial="yes" name="glib_error_reporting">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-     </component>
-     <component unofficial="yes" name="glib_keyvalue_file_parser">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-     </component>
-     <component unofficial="yes" name="glib_internationalization">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-     </component>
-     <component unofficial="yes" name="utility_apis">
-      <unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
-     </component>
-     <component unofficial="yes" name="glib_signals">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-     </component>
-     <component unofficial="yes" name="glib_miscellaneous_utility_functions">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_unicode_manipulation">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-     </component>
-     <component unofficial="yes" name="glib_memory_slices">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-     </component>
-     <component unofficial="yes" name="glib_nary_trees">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-     </component>
-     <component unofficial="yes" name="exceptions">
-      <unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
-     </component>
-     <component unofficial="yes" name="glib_date_and_time_functions">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-     </component>
-     <component unofficial="yes" name="debug">
-      <unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_inputoutput_and_data_encoding_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_atomic_operations">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-     </component>
-     <component unofficial="yes" name="glib_asynchronous_queues">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-     </component>
-     <component unofficial="yes" name="glib_random_numbers">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-     </component>
-     <component unofficial="yes" name="gtype">
-      <unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-     </component>
-     <component unofficial="yes" name="ossrv_pub_configuration">
-      <unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
-     </component>
-     <component unofficial="yes" name="ssl_protocol_methods_api">
-      <unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
-     </component>
-     <component unofficial="yes" name="ssl_general_api">
+     <component unofficial="yes" name="ossrv_pub" long-name="Generic OS Services Public Interfaces" class="api">
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
+      <!-- <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
+      <unit bldFile="os/ossrv/ossrv_pub/group"/>
       <!-- <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/tsrc/group"/> -->
-      <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_quarks">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-     </component>
-     <component unofficial="yes" name="gboxed">
-      <unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-     </component>
-     <component unofficial="yes" name="memory">
-      <unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_certificates_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
-     </component>
-     <component unofficial="yes" name="gobject">
-      <unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-     </component>
-     <component unofficial="yes" name="glib_doublylinked_lists">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-     </component>
-     <component unofficial="yes" name="glib_datasets">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-     </component>
-     <component unofficial="yes" name="glib_character_set_conversion">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-     </component>
-     <component unofficial="yes" name="glib_singlylinked_lists">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-     </component>
-     <component unofficial="yes" name="glib_relations_and_tuples">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-     </component>
-     <component unofficial="yes" name="glib_timers">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-     </component>
-     <component unofficial="yes" name="gtypemodule">
-      <unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-     </component>
-     <component unofficial="yes" name="glib_file_utilities">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-     </component>
-     <component unofficial="yes" name="glib_standard_macros">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_utility_functions_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
-     </component>
-     <component unofficial="yes" name="compiler_specific_runtime_support">
-      <unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
-     </component>
-     <component unofficial="yes" name="glib_simple_xml_subset_parser">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-     </component>
-     <component unofficial="yes" name="glib_enums_and_flags">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-     </component>
-     <component unofficial="yes" name="character_type_apis">
-      <unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
-     </component>
-     <component unofficial="yes" name="glib_parameters_and_values">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-     </component>
-     <component unofficial="yes" name="glib_lexical_scanner">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-     </component>
-     <component unofficial="yes" name="glib_spawning_processes">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-     </component>
-     <component unofficial="yes" name="glib_closures">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-     </component>
-     <component unofficial="yes" name="glib_arrays">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="crypto_symmetric_ciphers_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
-     </component>
-     <component unofficial="yes" name="stl">
       <!-- <unit bldFile="os/ossrv/ossrv_pub/stl/tsrc/group"/> -->
-      <unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
-     </component>
-     <component unofficial="yes" name="math_operations_api">
-      <unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
-     </component>
-     <component unofficial="yes" name="io_stream_api">
-      <unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
-     </component>
-     <component unofficial="yes" name="gtypeplugin">
-      <unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-     </component>
-     <component unofficial="yes" name="boost_apis">
-      <unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
-      <!-- <unit bldFile="os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="crypto_auxillary_functions_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
-     </component>
-     <component unofficial="yes" name="cpp_wrappers">
-      <unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
-     </component>
-     <component unofficial="yes" name="thread_api">
-      <unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_doubleended_queues">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-     </component>
-     <component unofficial="yes" name="type_attributes">
-      <unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
-     </component>
-     <component unofficial="yes" name="glib_main_event_loop">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-     </component>
-     <component unofficial="yes" name="glib_threads">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-     </component>
-     <component unofficial="yes" name="typeinfo">
-      <unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
-     </component>
-     <component unofficial="yes" name="glib_globstyle_pattern_matching">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-     </component>
-     <component unofficial="yes" name="glib_dynamic_loading_of_modules">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-     </component>
-     <component unofficial="yes" name="openc_wrappers">
-      <unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
-     </component>
-     <component unofficial="yes" name="glib_hash_tables">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-     </component>
-     <component unofficial="yes" name="glib_thread_pools">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-     </component>
-     <component unofficial="yes" name="glib_shellrelated_utilities">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-     </component>
-     <component unofficial="yes" name="openc_headers">
-      <unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_public_key_cryptography_and_key_agreement_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_commandline_option_parser">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-     </component>
-     <component unofficial="yes" name="crypto_authentication_codes_and_hash_functions_api">
-      <unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
-     </component>
-     <component unofficial="yes" name="glib_basic_types">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-     </component>
-     <component unofficial="yes" name="glib_value_arrays">
-      <unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
      </component>
     </collection>
    </block>
@@ -521,6 +261,9 @@
       <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/serverexe/group"/> -->
       <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/tsrc/public/basic/group"/> -->
      </component>
+     <component unofficial="yes" name="featuremgmt_build" long-name="Feature Management Build">
+      <unit bldFile="os/devicesrv/featuremgmt/group"/>
+     </component>
     </collection>
    </block>
    <block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
@@ -593,7 +336,7 @@
      <component name="commonengineresources" long-name="Common Engine Resources">
       <unit bldFile="os/devicesrv/commonservices/commonengineresources/group"/>
      </component>
-     <component name="PlatformEnv" long-name="Platform Env">
+     <component name="platformenv" long-name="Platform Env">
       <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/disknotifyhandler/group"/> -->
       <unit bldFile="os/devicesrv/commonservices/platformenv/group"/>
       <!-- <unit bldFile="os/devicesrv/commonservices/platformenv/platformver/group"/> -->
@@ -623,10 +366,10 @@
      <component unofficial="yes" name="dosservices_test" long-name="Dos Services Test">
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
       <!-- <unit bldFile="os/devicesrv/dosservices/tsrc/dsytesttool/group"/> -->
      </component>
      <component unofficial="yes" name="dosservices_build" long-name="Dos Services Build">
@@ -634,28 +377,28 @@
      </component>
     </collection>
     <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-     <component name="ServerExe" long-name="Server Exe">
+     <component name="serverexe" long-name="Server Exe">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/serverexe/group"/> -->
      </component>
      <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
      </component>
-     <component name="ClientDll" long-name="Client DLL">
+     <component name="clientdll" long-name="Client DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/clientdll/group"/> -->
      </component>
-     <component name="CommonDll" long-name="Common DLL">
+     <component name="commondll" long-name="Common DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/commondll/group"/> -->
      </component>
-     <component name="VibraClientDll" long-name="Vibra Client DLL">
+     <component name="vibraclientdll" long-name="Vibra Client DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/vibraclientdll/group"/> -->
      </component>
-     <component name="ExtendedLightClientDll" long-name="Extended Light Client DLL">
+     <component name="extendedlightclientdll" long-name="Extended Light Client DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/extendedlightclientdll/group"/> -->
      </component>
-     <component name="LightClientDll" long-name="Light Client DLL">
+     <component name="lightclientdll" long-name="Light Client DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/lightclientdll/group"/> -->
      </component>
-     <component name="FmTxClientDll" long-name="FM TX Client DLL">
+     <component name="fmtxclientdll" long-name="FM TX Client DLL">
       <!-- <unit bldFile="os/devicesrv/resourcemgmt/fmtxclientdll/group"/> -->
      </component>
      <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin">
@@ -703,8 +446,8 @@
     </collection>
     <collection name="mediator" long-name="Mediator" level="app-if">
      <component unofficial="yes" name="mediator_test" long-name="Mediator Test">
+      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/group"/> -->
       <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/stub/group"/> -->
-      <!-- <unit bldFile="os/devicesrv/mediator/tsrc/public/basic/group"/> -->
      </component>
      <component unofficial="yes" name="mediator_build" long-name="Mediator Build">
       <unit bldFile="os/devicesrv/mediator/group"/>
@@ -776,320 +519,34 @@
       <!-- <unit bldFile="os/devicesrv/sysstatemgmt/tsrc/public/basic/group"/> -->
      </component>
     </collection>
-    <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
-     <component unofficial="yes" name="vibra_settings_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/vibra_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_channel_api">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
-     </component>
-     <component unofficial="yes" name="platform_environment_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+    <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
+     <component unofficial="yes" name="devicesrv_pub" long-name="Device Services Public Interfaces" class="api">
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
+      <unit bldFile="os/devicesrv/devicesrv_pub/group"/>
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
       <!-- <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
-     </component>
-     <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_channel_api/tsrc/bc/sensor/group"/> -->
       <!-- <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"/> -->
-     </component>
-     <component unofficial="yes" name="sysutil_api">
       <!-- <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/sysutil_api/group"/>
-     </component>
-     <component unofficial="yes" name="string_loader_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/string_loader_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_platform_security_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="platform_path_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="cone_resource_loader_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/cone_resource_loader_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
-     </component>
-     <component unofficial="yes" name="vibra_api">
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
+      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
       <!-- <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/vibra_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="find_item_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
-     </component>
-     <component unofficial="yes" name="hwrm_power_state_api">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/hwrm_power_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="light_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/light_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
-     </component>
-     <component unofficial="yes" name="text_resolver_api">
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_pub/text_resolver_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_discovery_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
-     </component>
-     <component unofficial="yes" name="accessory_monitoring_api">
-      <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
-      <!-- <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
-     </component>
-    </collection>
-    <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-     <component unofficial="yes" name="featuremgmt">
-      <unit bldFile="os/devicesrv/featuremgmt/group"/>
      </component>
      <component unofficial="yes" name="devicesrv_build" long-name="Device Services Build">
       <unit bldFile="os/devicesrv/group"/>
      </component>
-    </collection>
-    <collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="string_resource_reader_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/string_resource_reader_api/group"/>
-     </component>
-     <component unofficial="yes" name="sae_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
-     </component>
-     <component unofficial="yes" name="tv_out_config_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_effect_data_getter_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="configuration_file_parser_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_version_info_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_api/group"/>
-     </component>
-     <component unofficial="yes" name="power_state_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/power_state_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_audio_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="lights_commands_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/lights_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_adaptation_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/startup_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_notification_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="hw_settings_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_static_registration_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
-     </component>
-     <component unofficial="yes" name="powersave_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_event_consumer_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_manager_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/feature_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_reason_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/startup_reason_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_extension_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="security_notification_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/security_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_data_compensator_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="isc_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/isc_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_key_event_handling_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
-     </component>
-     <component unofficial="yes" name="tiltcompensation_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
-     </component>
-     <component unofficial="yes" name="haptics_packetizer_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="dos_extension_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_startup_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_startup_api/group"/>
-     </component>
-     <component unofficial="yes" name="hw_resource_blocking_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hw_resource_blocking_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_command_initiator_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
-     </component>
-     <component unofficial="yes" name="disk_and_memory_level_keys_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_status_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/startup_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="remote_control_extension_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_state_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/system_state_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="vibra_commands_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/vibra_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_event_provider_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_dsy_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_policy_utility_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_state_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="hw_resource_manager_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hw_resource_manager_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_settings_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="tspclientmapper_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
-     </component>
-     <component unofficial="yes" name="powersave_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
-     </component>
-     <component unofficial="yes" name="shared_data_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_policy_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_domain_definitions_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
-     </component>
-     <component unofficial="yes" name="target_modifier_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/target_modifier_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_bluetooth_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="light_settings_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/light_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="accessory_settings_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="wakeup_alarm_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
-     </component>
-     <component unofficial="yes" name="activity_manager_api">
+     <component unofficial="yes" name="devicesrv_plat" long-name="Device Services Platform Interfaces" class="api">
       <!-- <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/tsrc/group"/> -->
-      <unit bldFile="os/devicesrv/devicesrv_plat/activity_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/feature_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="sim_utils_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sim_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="dos_extension_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="hwrm_fmtx_audio_policy_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/hwrm_fmtx_audio_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="headset_status_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="display_language_definition_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="feature_info_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/feature_info_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="fm_tx_commands_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/fm_tx_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_content_policy_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/common_content_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="mediator_command_responder_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_light_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_light_api/group"/>
-     </component>
-     <component unofficial="yes" name="disk_notification_handler_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="powersave_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="syslangutil_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_channel_filter_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_version_info_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_startup_control_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/system_startup_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_startup_extension_plugin_api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+      <unit bldFile="os/devicesrv/devicesrv_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adaptation management application-interface">
-    <collection name="Data Source Modules" long-name="Generic Positioning Plugins" level="data-acquisition">
+    <collection name="datasourcemodules" long-name="Generic Positioning Plugins">
      <component name="locationnpppsy" long-name="Location NPP PSY">
       <unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
      </component>
@@ -1146,58 +603,15 @@
      <component name="dut" long-name="Dut"/>
      <component name="ping" long-name="Ping"/>
     </collection>
-    <collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
-     <component unofficial="yes" name="wlan_sdk_info_api">
-      <unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
-     </component>
-    </collection>
     <collection name="wlan_info" long-name="WLAN Info" level="test">
+     <component unofficial="yes" name="wlan_pub" long-name="WLAN Public Interfaces" class="api">
+      <unit bldFile="os/wlan/wlan_pub/group"/>
+     </component>
      <component unofficial="yes" name="wlan_build" long-name="WLAN Build">
       <unit bldFile="os/wlan/group"/>
      </component>
-    </collection>
-    <collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
-     <component unofficial="yes" name="wlan_agent_hotspot_plugin_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_hal_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_management_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_control_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_info_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_hpa_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_eapol_plugin_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_osa_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_device_settings_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_hw_initialization_data_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_dbif_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_power_save_plugin_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_spia_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_generic_plugin_api">
-      <unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+     <component unofficial="yes" name="wlan_plat" long-name="WLAN Platform Interfaces" class="api">
+      <unit bldFile="os/wlan/wlan_plat/group"/>
      </component>
     </collection>
    </block>
@@ -1245,16 +659,14 @@
      <component unofficial="yes" name="cellularsrv_build" long-name="Cellular Baseband Services Build">
       <unit bldFile="os/cellularsrv/group"/>
      </component>
-    </collection>
-    <collection name="cellularsrv_plat" long-name="Cellular Baseband Services Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="primary_pdp_context_qos_parameter_setting_api">
-      <unit bldFile="os/cellularsrv/cellularsrv_plat/primary_pdp_context_qos_parameter_setting_api/group"/>
+     <component unofficial="yes" name="cellularsrv_plat" long-name="Cellular Baseband Services Platform Interfaces" class="api">
+      <unit bldFile="os/cellularsrv/cellularsrv_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
     <collection name="audio" long-name="Audio Codecs" level="middleware">
-     <component name="ARM_CMMF_codecs" long-name="ARM CMMF Codecs">
+     <component name="arm_cmmf_codecs" long-name="ARM CMMF Codecs">
       <unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
      </component>
      <component unofficial="yes" name="audio_build" long-name="Audio Codecs Build">
@@ -1262,7 +674,7 @@
      </component>
     </collection>
     <collection name="video" long-name="Video Codecs" level="middleware">
-     <component name="ARM_MDF_Decoders" long-name="ARM MDF Decoders">
+     <component name="arm_mdf_decoders" long-name="ARM MDF Decoders">
       <unit bldFile="os/mm/video/group"/>
      </component>
     </collection>
@@ -1328,255 +740,37 @@
      </component>
     </collection>
     <collection name="mm_info" long-name="Multimedia Info" level="app-if">
+     <component unofficial="yes" name="mm_pub" long-name="Multimedia Public Interfaces" class="api">
+      <unit bldFile="os/mm/mm_pub/audio_effects_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/drm_audio_player_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_pub/group"/>
+     </component>
      <component unofficial="yes" name="mm_build" long-name="Multimedia Build">
       <unit bldFile="os/mm/group"/>
      </component>
      <component unofficial="yes" name="mm_test" long-name="Multimedia Test">
       <!-- <unit bldFile="os/mm/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="mm_plat" long-name="Multimedia Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="custom_interface_message_handler_factory_api">
-      <unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_visualization_api">
-      <unit bldFile="os/mm/mm_plat/audio_visualization_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_proxy_api">
-      <unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="frametable_api">
-      <unit bldFile="os/mm/mm_plat/frametable_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_decoder_scaling_mdf_custom_interface">
-      <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="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"/>
-     </component>
-     <component unofficial="yes" name="g711_decoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="rds_adaptation_api">
-      <unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_msg_hdlr_api">
-      <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="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"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_api">
-      <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_buffer_management_mdf_custom_interface">
-      <unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_utility_api">
-      <unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_encoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="fm_radio_adaptation_api">
-      <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="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>
-     <component unofficial="yes" name="restricted_audio_output_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_proxy_api">
-      <unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaacplusutil_api">
-      <unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_api">
-      <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="display_posting_api">
-      <unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_policy_header_api">
-      <unit bldFile="os/mm/mm_plat/audio_policy_header_api/group"/>
-     </component>
-     <component unofficial="yes" name="nokia_audio_policy_header_api">
-      <unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_routing_api">
-      <unit bldFile="os/mm/mm_plat/audio_routing_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_encoder_config_proxy_api">
-      <unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="mdf_plugin_uids">
-      <unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_builder_api">
-      <unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_audio_settings_definition_api">
-      <unit bldFile="os/mm/mm_plat/global_audio_settings_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="sbc_encoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_fourcc_definitions_api">
-      <unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="devsound_adaptation_api">
-      <unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="aac_decoder_config_api">
-      <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_reclaim_extbuffers_ci">
-      <unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_api">
-      <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group"/>
-     </component>
-     <component unofficial="yes" name="nokia_multimedia_fourcc_definitions_api">
-      <unit bldFile="os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_encoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="custom_interface_proxy_factory_api">
-      <unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="g711_encoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="ilbc_decoder_interface_msg_hdlr_api">
-      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_window_control_custom_interface">
-      <unit bldFile="os/mm/mm_plat/video_window_control_custom_interface/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_proxy_api">
-      <unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="ra8_decoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="g729_decoder_interface_api">
-      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_audio_routing_client_api">
-      <unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaac_plus_decoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_audio_settings_api">
-      <unit bldFile="os/mm/mm_plat/global_audio_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="added_devsound_control_api">
-      <unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="error_concealment_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="wma_decoder_interface_proxy_api">
-      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="restricted_audio_output_proxy_api">
-      <unit bldFile="os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
-     </component>
-     <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="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">
-      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
-     </component>
-    </collection>
-    <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
-     <component unofficial="yes" name="audio_effects_presets_api">
-      <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_audio_player_api">
-      <unit bldFile="os/mm/mm_pub/drm_audio_player_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_extension_interfaces_api">
-      <unit bldFile="os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_effects_api">
-      <unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
+     <component unofficial="yes" name="mm_plat" long-name="Multimedia Platform Interfaces" class="api">
+      <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/audio_routing_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/audio_visualization_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/global_audio_settings_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/group"/>
+      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/tsrc/group"/>
+      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/tsrc/group"/>
      </component>
     </collection>
    </block>
@@ -1596,38 +790,19 @@
      <component name="jp2kcodec" long-name="JP2K Codec">
       <unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
      </component>
-     <component name="H264AVCVideoEncARM" long-name="H264AVC VideoEnc ARM"/>
-     <component name="VideoEncPluginARM" long-name="VideoEnc Plugin ARM"/>
+     <component name="h264avcvideoencarm" long-name="H264AVC VideoEnc ARM"/>
+     <component name="videoencpluginarm" long-name="VideoEnc Plugin ARM"/>
     </collection>
     <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
+     <component unofficial="yes" name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" class="api">
+      <unit bldFile="os/imagingext/imagingext_plat/group"/>
+     </component>
      <component unofficial="yes" name="imagingext_build" long-name="Imaging Extensions Build">
       <unit bldFile="os/imagingext/group"/>
      </component>
-    </collection>
-    <collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
-     <component unofficial="yes" name="h324_annex_k_custom_api">
-      <unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
-     </component>
-     <component unofficial="yes" name="jpeg2000_icl_plugin_api">
-      <unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ecam_face_tracking_custom_api">
-      <unit bldFile="os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
-     </component>
-     <component unofficial="yes" name="ecam_orientation_custom_api">
-      <unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_icl_jpeg_api">
-      <unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group"/>
-     </component>
-     <component unofficial="yes" name="ecam_ui_orientation_override_custom_api">
-      <unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
-     </component>
-    </collection>
-    <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
-     <component unofficial="yes" name="exif_api">
+     <component unofficial="yes" name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" class="api">
       <!-- <unit bldFile="os/imagingext/imagingext_pub/exif_api/tsrc/group"/> -->
-      <unit bldFile="os/imagingext/imagingext_pub/exif_api/group"/>
+      <unit bldFile="os/imagingext/imagingext_pub/group"/>
      </component>
     </collection>
    </block>
@@ -1636,7 +811,7 @@
      <component name="vgi" long-name="VGI">
       <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
      </component>
-     <component name="2D_OpenVG_1_0" long-name="2D Open VG 1.0"/>
+     <component name="2d_openvg_1_0" long-name="2D Open VG 1.0"/>
      <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1"/>
     </collection>
     <collection name="m3g" long-name="M3G" level="internal-adaptations">
@@ -1644,26 +819,19 @@
       <unit bldFile="os/graphics/m3g/m3gcore11/group"/>
      </component>
     </collection>
-    <collection name="graphics_pub" long-name="Graphics Public Interfaces" level="app-if">
-     <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/animplugin/group"/> -->
       <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
-      <!-- <unit bldFile="os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
+     </component>
+     <component unofficial="yes" name="graphics_pub" long-name="Graphics Public Interfaces" class="api">
+      <!-- <unit bldFile="os/graphics/graphics_pub/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 unofficial="yes" name="openvg_binding_api">
-      <unit bldFile="os/graphics/graphics_plat/openvg_binding_api/group"/>
-     </component>
-     <component unofficial="yes" name="m3g_core_api">
-      <unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
+     <component unofficial="yes" name="graphics_plat" long-name="Graphics Platform Interfaces" class="api">
+      <unit bldFile="os/graphics/graphics_plat/group"/>
      </component>
     </collection>
    </block>
@@ -1680,10 +848,10 @@
      <!--<component name="charconvplugins"/>-->
     </collection>
     <collection name="textandlocutils" level="util">
-     <component name="Localizer" long-name="Localizer">
+     <component name="localizer" long-name="Localizer">
       <unit bldFile="os/textandloc/charconvfw/localizer/group"/>
      </component>
-     <component name="Findutil" long-name="Find Util">
+     <component name="findutil" long-name="Find Util">
       <unit bldFile="os/textandloc/charconvfw/findutil/group"/>
      </component>
      <component name="numbergrouping" long-name="Number Grouping">
@@ -1692,50 +860,31 @@
      <component name="gamerecognizer" long-name="Game Recognizer">
       <unit bldFile="os/textandloc/charconvfw/gamerecognizer/group"/>
      </component>
-     <component name="JPLangUtil" long-name="JP Lang Util">
+     <component name="jplangutil" long-name="JP Lang Util">
       <unit bldFile="os/textandloc/charconvfw/jplangutil/group"/>
      </component>
-     <component name="SortUtil" long-name="Sort Util">
+     <component name="sortutil" long-name="Sort Util">
       <unit bldFile="os/textandloc/charconvfw/sortutil/group"/>
      </component>
-     <component name="AknJapaneseReading" long-name="Akn Japanese Reading">
+     <component name="aknjapanesereading" long-name="Akn Japanese Reading">
       <unit bldFile="os/textandloc/charconvfw/aknjapanesereading/group"/>
      </component>
      <component name="inlinetext" long-name="Inline Text">
       <unit bldFile="os/textandloc/charconvfw/inlinetext/group"/>
      </component>
     </collection>
-    <collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
-     <component unofficial="yes" name="directory_localizer_api">
-      <unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
-     </component>
-     <component unofficial="yes" name="character_conversion_api">
-      <unit bldFile="os/textandloc/textandloc_pub/character_conversion_api/group"/>
-     </component>
-     <component unofficial="yes" name="character_conversion_plugin_provider_api">
+    <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
+     <component unofficial="yes" name="textandloc_pub" long-name="Text and Localisation Public Interfaces" class="api">
       <!-- <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
-      <unit bldFile="os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/group"/>
-     </component>
-    </collection>
-    <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
+      <unit bldFile="os/textandloc/textandloc_pub/group"/>
+     </component>
      <component unofficial="yes" name="textandloc_build" long-name="Text and Localisation Build">
       <unit bldFile="os/textandloc/group"/>
      </component>
-    </collection>
-    <collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
-     <component unofficial="yes" name="findutil_api">
-      <unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
+     <component unofficial="yes" name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" class="api">
       <!-- <unit bldFile="os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="japanese_language_utilities_api">
-      <unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="character_conversion_nonpublic_api">
-      <unit bldFile="os/textandloc/textandloc_plat/character_conversion_nonpublic_api/group"/>
-     </component>
-     <component unofficial="yes" name="sortutil_api">
+      <unit bldFile="os/textandloc/textandloc_plat/group"/>
       <!-- <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
-      <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
      </component>
     </collection>
    </block>
@@ -1778,86 +927,37 @@
      </component>
     </collection>
     <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
+     <component unofficial="yes" name="xmlsrv_plat" long-name="XML Services Platform Interfaces" class="api">
+      <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="xmlsrv_build" long-name="XML Services Build">
       <unit bldFile="os/xmlsrv/group"/>
      </component>
-    </collection>
-    <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="xml_engine_serializer_api">
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_utils_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_xml_pointer_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_pointer_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_encryption_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_encryption_api/group"/>
-      <!-- <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">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_engine_utils_api">
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_canonical_xml_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_canonical_xml_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_signature_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/group"/>
-      <!-- <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="libxml2_xpath_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xpath_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_engine_deserializer_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/xml_engine_deserializer_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_xml_linking_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_xml_linking_api/group"/>
-     </component>
-     <component unofficial="yes" name="libxml2_parser_api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/libxml2_parser_api/group"/>
-     </component>
-    </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"/>
+     <component unofficial="yes" name="xmlsrv_pub" long-name="XML Services Public Interfaces" class="api">
+      <unit bldFile="os/xmlsrv/xmlsrv_pub/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">
-     <component name="S60Extras compo" long-name="S60 Extras Component">
+    <collection name="s60extras" long-name="S60 Extras" level="mid">
+     <component name="s60extras_build" long-name="S60 Extras Component">
       <unit bldFile="os/deviceplatformrelease/s60extras/group"/>
      </component>
     </collection>
-    <collection name="S60LocFiles" long-name="S60 Loc Files" level="mid">
-     <component name="S60LocFiles compo" long-name="S60 Loc Files Component">
+    <collection name="s60locfiles" long-name="S60 Loc Files" level="mid">
+     <component name="s60locfiles_build" long-name="S60 Loc Files Component">
       <unit bldFile="os/deviceplatformrelease/s60locfiles/group"/>
      </component>
     </collection>
-    <collection name="Version" long-name="Version" level="top">
-     <component name="Version compo" long-name="Version Component">
+    <collection name="version" long-name="Version" level="top">
+     <component name="version_build" long-name="Version Component">
       <unit bldFile="os/deviceplatformrelease/version/group"/>
      </component>
     </collection>
@@ -1877,72 +977,72 @@
    </block>
    <block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
     <collection name="stif" long-name="STIF" level="fw">
-     <component name="TestInterface" long-name="Test Interface">
+     <component name="testinterface" long-name="Test Interface">
       <unit bldFile="ostools/osrndtools/stif/testinterface/group"/>
      </component>
-     <component name="TestServer" long-name="Test Server">
+     <component name="testserver" long-name="Test Server">
       <unit bldFile="ostools/osrndtools/stif/testserver/group"/>
      </component>
-     <component name="TestEngine" long-name="Test Engine">
+     <component name="testengine" long-name="Test Engine">
       <unit bldFile="ostools/osrndtools/stif/testengine/group"/>
      </component>
-     <component name="TestServerStarter" long-name="Test Server Starter">
+     <component name="testserverstarter" long-name="Test Server Starter">
       <unit bldFile="ostools/osrndtools/stif/testserverstarter/group"/>
      </component>
-     <component name="StifTFwIf" long-name="STIF TFwIf">
+     <component name="stiftfwif" long-name="STIF TFwIf">
       <unit bldFile="ostools/osrndtools/stif/stiftfwif/group"/>
      </component>
-     <component name="ConsoleUI" long-name="Console UI">
+     <component name="consoleui" long-name="Console UI">
       <unit bldFile="ostools/osrndtools/stif/consoleui/group"/>
      </component>
-     <component name="TestCombiner" long-name="Test Combiner">
+     <component name="testcombiner" long-name="Test Combiner">
       <unit bldFile="ostools/osrndtools/stif/testcombiner/group"/>
      </component>
-     <component name="DemoModule" long-name="Demo Module">
+     <component name="demomodule" long-name="Demo Module">
       <unit bldFile="ostools/osrndtools/stif/demomodule/group"/>
      </component>
-     <component name="ATSLogger" long-name="ATS Logger">
+     <component name="atslogger" long-name="ATS Logger">
       <unit bldFile="ostools/osrndtools/stif/atslogger/group"/>
      </component>
-     <component name="ATSInterface" long-name="ATS Interface">
+     <component name="atsinterface" long-name="ATS Interface">
       <unit bldFile="ostools/osrndtools/stif/atsinterface/group"/>
      </component>
-     <component name="TestScripter" long-name="Test Scripter">
+     <component name="testscripter" long-name="Test Scripter">
       <unit bldFile="ostools/osrndtools/stif/testscripter/group"/>
      </component>
-     <component name="SUEvent" long-name="SU Event">
+     <component name="suevent" long-name="SU Event">
       <unit bldFile="ostools/osrndtools/stif/suevent/group"/>
      </component>
-     <component name="StifKernelTestClassBase" long-name="STIF Kernel Test Class Base">
+     <component name="stifkerneltestclassbase" long-name="STIF Kernel Test Class Base">
       <unit bldFile="ostools/osrndtools/stif/stifkerneltestclassbase/group"/>
      </component>
      <component name="examples" long-name="Examples">
       <!-- <unit bldFile="ostools/osrndtools/stif/examples/stiftestmeasurementstub/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/examples/stifhwresetstub/group"/> -->
      </component>
-     <component name="TestModuleTemplates" long-name="Test Module Templates">
+     <component name="testmoduletemplates" long-name="Test Module Templates">
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/capsmodifierxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/testmodulexxx/group"/> -->
+      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
       <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
-      <!-- <unit bldFile="ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
      </component>
      <component unofficial="yes" name="stif_build" long-name="STIF Build">
       <unit bldFile="ostools/osrndtools/stif/group"/>
      </component>
     </collection>
     <collection name="memspy" long-name="Memspy" level="trace">
-     <component name="Driver">
+     <component name="driver">
       <unit bldFile="ostools/osrndtools/memspy/driver/group"/>
      </component>
-     <component name="Engine">
+     <component name="memspy_engine">
       <unit bldFile="ostools/osrndtools/memspy/engine/group"/>
      </component>
-     <component name="CommandLine">
+     <component name="commandline">
       <unit bldFile="ostools/osrndtools/memspy/commandline/group"/>
      </component>
-     <component name="Console">
+     <component name="console">
       <unit bldFile="ostools/osrndtools/memspy/console/group"/>
      </component>
      <component unofficial="yes" name="memspy_build" long-name="Memspy Build">
@@ -1950,45 +1050,36 @@
      </component>
     </collection>
     <collection name="hti" long-name="HTI" level="trace">
-     <component name="HtiCfg">
+     <component name="hticfg">
       <unit bldFile="ostools/osrndtools/hti/hticfg/group"/>
      </component>
-     <component name="HtiAutoStart">
+     <component name="htiautostart">
       <unit bldFile="ostools/osrndtools/hti/htiautostart/group"/>
      </component>
-     <component name="HtiFramework">
+     <component name="htiframework">
       <unit bldFile="ostools/osrndtools/hti/htiframework/group"/>
      </component>
-     <component name="HtiCommPlugins" long-name="HTI Comm Plugins"/>
-     <component name="HtiServicePlugins" long-name="HTI Service Plugins"/>
-     <component name="HtiFileHlp">
+     <!-- Empty duplicate component HtiCommPlugins removed -->
+     <!-- Empty duplicate component HtiServicePlugins removed -->
+     <component name="htifilehlp">
       <unit bldFile="ostools/osrndtools/hti/htifilehlp/group"/>
      </component>
-     <component name="HtiWatchDog">
+     <component name="htiwatchdog">
       <unit bldFile="ostools/osrndtools/hti/htiwatchdog/group"/>
      </component>
      <component unofficial="yes" name="hti_build" long-name="HTI Build">
       <unit bldFile="ostools/osrndtools/hti/group"/>
      </component>
     </collection>
-    <collection name="osrndtools_plat" long-name="OS RD tools Platform Interfaces" level="trace">
-     <component unofficial="yes" name="memspy_api">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/memspy_api/group"/>
-     </component>
-     <component unofficial="yes" name="stif_api">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/stif_api/group"/>
-     </component>
-     <component unofficial="yes" name="hti_api">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/hti_api/group"/>
-     </component>
-     <component unofficial="yes" name="open_system_trace_api">
-      <unit bldFile="ostools/osrndtools/osrndtools_plat/open_system_trace_api/group"/>
+    <collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
+     <component unofficial="yes" name="osrndtools_build" long-name="OS RD tools Build">
+      <unit bldFile="ostools/osrndtools/group"/>
      </component>
     </collection>
    </block>
    <block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
     <collection name="gid_pc_tool" long-name="GID PC Tool">
-     <component name="DBImporter" long-name="DB Importer">
+     <component name="dbimporter" long-name="DB Importer">
       <unit bldFile="tools/swconfigtools/gid_pc_tool/group"/>
      </component>
     </collection>
@@ -2005,15 +1096,7 @@
      <component unofficial="yes" name="shortlinksrv_build">
       <unit bldFile="os/shortlinksrv/group"/>
      </component>
-    </collection>
-    <collection name="shortlinksrv_plat">
-     <component unofficial="yes" name="bluetooth_power_management_api">
-      <unit bldFile="os/shortlinksrv/shortlinksrv_plat/bluetooth_power_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_audio_adaptation_api">
-      <unit bldFile="os/shortlinksrv/shortlinksrv_plat/bluetooth_audio_adaptation_api/group"/>
-     </component>
-     <component unofficial="yes" name="shortlinksrv_plat_build">
+     <component unofficial="yes" name="shortlinksrv_plat" class="api">
       <unit bldFile="os/shortlinksrv/shortlinksrv_plat/group"/>
      </component>
     </collection>
@@ -2042,7 +1125,7 @@
      </component>
     </collection>
     <collection name="gssettingsuis" long-name="GS Settings UIs" level="specific">
-     <component name="Gs" long-name="GS">
+     <component name="gs" long-name="GS">
       <unit bldFile="mw/appsupport/gssettingsuis/gs/group"/>
       <!-- <unit bldFile="mw/appsupport/gssettingsuis/gs/gsdiagnosticsplugin"/> -->
       <!-- <unit bldFile="mw/appsupport/gssettingsuis/gs/gsprslnplugin"/> -->
@@ -2050,18 +1133,18 @@
      </component>
     </collection>
     <collection name="profilesservices" long-name="Profiles Services" level="server">
-     <component name="FileList" long-name="File List">
+     <component name="filelist" long-name="File List">
       <unit bldFile="mw/appsupport/profilesservices/filelist/group"/>
       <unit bldFile="mw/appsupport/profilesservices/filelist/tsrc/public/basic/group"/>
      </component>
-     <component name="MediaFileList" long-name="Media File List">
+     <component name="mediafilelist" long-name="Media File List">
       <unit bldFile="mw/appsupport/profilesservices/mediafilelist/group"/>
      </component>
-     <component name="ProfileEngine" long-name="Profile Engine">
+     <component name="profileengine" long-name="Profile Engine">
       <unit bldFile="mw/appsupport/profilesservices/profileengine/group"/>
       <unit bldFile="mw/appsupport/profilesservices/profileengine/tsrc/public/basic/group"/>
      </component>
-     <component name="RingingTone3DPlugin" long-name="Ringing Tone 3D Plugin">
+     <component name="ringingtone3dplugin" long-name="Ringing Tone 3D Plugin">
       <unit bldFile="mw/appsupport/profilesservices/ringingtone3dplugin/group"/>
      </component>
      <component unofficial="yes" name="profilesservices_test" long-name="Profiles Services Test">
@@ -2069,7 +1152,7 @@
      </component>
     </collection>
     <collection name="flashliteapi_3_1" long-name="Flashlite API 3.1" level="specific">
-     <component name="flashliteapi_3_1 compo"/>
+     <component name="flashliteapi_3_1_build"/>
     </collection>
     <collection name="contextframework" long-name="Context Framework" level="framework">
      <component name="cfw" long-name="Context Framework">
@@ -2085,10 +1168,10 @@
      </component>
     </collection>
     <collection name="mediakeys" long-name="Media Keys" level="plugin">
-     <component name="KeyPublisherPlugin" long-name="Key Publisher Plugin">
+     <component name="keypublisherplugin" long-name="Key Publisher Plugin">
       <!-- <unit bldFile="mw/appsupport/mediakeys/keypublisherplugin/group"/> -->
      </component>
-     <component name="MMKeyBearer" long-name="MM Key Bearer">
+     <component name="mmkeybearer" long-name="MM Key Bearer">
       <!-- <unit bldFile="mw/appsupport/mediakeys/mmkeybearer/group"/> -->
      </component>
      <component unofficial="yes" name="mediakeys_build" long-name="Media Keys Build">
@@ -2096,13 +1179,13 @@
      </component>
     </collection>
     <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-     <component name="DbRecovery" long-name="Db Recovery">
+     <component name="dbrecovery" long-name="Db Recovery">
       <unit bldFile="mw/appsupport/coreapplicationuis/dbrecovery/group"/>
      </component>
-     <component name="NspsWsPlugin" long-name="Nsps WS Plugin">
+     <component name="nspswsplugin" long-name="Nsps WS Plugin">
       <unit bldFile="mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
      </component>
-     <component name="Rfs" long-name="RFS">
+     <component name="rfs" long-name="RFS">
       <unit bldFile="mw/appsupport/coreapplicationuis/rfs/group"/>
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfs/plugins/gsrfsplugin/group"/> -->
      </component>
@@ -2111,10 +1194,10 @@
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group"/> -->
       <!-- <unit bldFile="mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group"/> -->
      </component>
-     <component name="SysAp" long-name="Sys Ap">
+     <component name="sysap" long-name="Sys Ap">
       <unit bldFile="mw/appsupport/coreapplicationuis/sysap/group"/>
      </component>
-     <component name="VariatedSettings" long-name="Variated Settings">
+     <component name="variatedsettings" long-name="Variated Settings">
       <unit bldFile="mw/appsupport/coreapplicationuis/variatedsettings/group"/>
      </component>
      <component name="accfwuinotifier" long-name="ACC Framework UI Notifier">
@@ -2135,10 +1218,10 @@
      <component name="gsserverenginestub" long-name="GS Server Engine Stub">
       <unit bldFile="mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
      </component>
-     <component name="GSServerEngine" long-name="GS Server Engine">
+     <component name="gsserverengine" long-name="GS Server Engine">
       <unit bldFile="mw/appsupport/coreapplicationuis/gsserverengine/group"/>
      </component>
-     <component name="GSServer" long-name="GS Server">
+     <component name="gsserver" long-name="GS Server">
       <unit bldFile="mw/appsupport/coreapplicationuis/gsserver/group"/>
      </component>
      <component name="sensordatacompensatorplugin" long-name="Sensor Data Compensator Plugin">
@@ -2154,10 +1237,10 @@
      </component>
     </collection>
     <collection name="startupservices" long-name="Startup Services" level="system">
-     <component name="SplashScreen" long-name="Splash Screen">
+     <component name="splashscreen" long-name="Splash Screen">
       <unit bldFile="mw/appsupport/startupservices/splashscreen/group"/>
      </component>
-     <component name="Startup">
+     <component name="startup">
       <unit bldFile="mw/appsupport/startupservices/startup/group"/>
       <!-- <unit bldFile="mw/appsupport/startupservices/startup/mediatorplugin/group"/> -->
       <!-- <unit bldFile="mw/appsupport/startupservices/startup/startupsyncplugin/group"/> -->
@@ -2174,155 +1257,28 @@
      <component name="gssensorplugin" long-name="GS Sensor Plugin">
       <unit bldFile="mw/appsupport/systemsettings/gssensorplugin/group"/>
      </component>
-     <component name="GSAccessoryPlugin" long-name="GS Accessory Plugin">
+     <component name="gsaccessoryplugin" long-name="GS Accessory Plugin">
       <unit bldFile="mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
      </component>
      <component unofficial="yes" name="systemsettings_build" long-name="System Settings Build">
       <unit bldFile="mw/appsupport/systemsettings/group"/>
      </component>
     </collection>
-    <collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
-     <component unofficial="yes" name="settings_launch_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/group"/>
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="secondary_display_startup_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_accfw_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_subscription_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
-     </component>
-     <component unofficial="yes" name="sensor_user_setting_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
-     </component>
-     <component unofficial="yes" name="action_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="application_orientation_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
-     </component>
-     <component unofficial="yes" name="filelist_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/filelist_api/group"/>
-     </component>
-     <component unofficial="yes" name="restore_factory_settings_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_source_settings_manager_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="oom_monitor_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
-     </component>
-     <component unofficial="yes" name="startup_configuration_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_framework_client_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_listbox_api">
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/tsrc/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_framework_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_framework_api/group"/>
+    <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
+     <component unofficial="yes" name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/group"/>
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_framework_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="context_framework_listener_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_framework_version_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_source_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="oom_monitor_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_framework_services_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_plugin_callback_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
-     </component>
-     <component unofficial="yes" name="profiles_mediafilelist_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/profiles_mediafilelist_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_uis_cenrep_collection_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_uis_cenrep_collection_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_notification_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_sysap_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
-     </component>
-     <component unofficial="yes" name="ood_threshold_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_backgroundimage_api">
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/tsrc/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_backgroundimage_api/group"/>
-     </component>
-     <component unofficial="yes" name="restore_factory_settings_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_keys_definition_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_system_state_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_light_control_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="operation_provider_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="profiles_engine_api">
-      <!-- <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/tsrc/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_plat/profiles_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="system_application_key_handler_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="context_access_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_event_framework_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_event_framework_mapper_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_plugin_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/settings_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonecmdhandler_api">
-      <unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
-     </component>
-    </collection>
-    <collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
-     <component unofficial="yes" name="profiles_engine_active_profile_settings_api">
-      <unit bldFile="mw/appsupport/appsupport_pub/profiles_engine_active_profile_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="flash_viewer_framework_api">
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_launch_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/appsupport/appsupport_plat/settings_listbox_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="appsupport_pub" long-name="Generic Application Support Public Interfaces" class="api">
       <!-- <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="network_status_api">
+      <unit bldFile="mw/appsupport/appsupport_pub/group"/>
       <!-- <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/> -->
-      <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="profiles_engine_wrapper_api">
-      <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="appsupport_build" long-name="Generic Application Support Build">
       <unit bldFile="mw/appsupport/group"/>
      </component>
@@ -2350,18 +1306,18 @@
      </component>
     </collection>
     <collection name="wim" long-name="WIM" level="framework">
-     <component name="SwimReader" long-name="Swim Reader"/>
-     <component name="Scard" long-name="S Card"/>
-     <component name="WimUtil" long-name="WIM Util"/>
-     <component name="WimServer" long-name="WIM Server"/>
-     <component name="WimClient" long-name="WIM Client"/>
-     <component name="WimPlugin" long-name="WIM Plugin"/>
+     <component name="swimreader" long-name="Swim Reader"/>
+     <component name="scard" long-name="S Card"/>
+     <component name="wimutil" long-name="WIM Util"/>
+     <component name="wimserver" long-name="WIM Server"/>
+     <component name="wimclient" long-name="WIM Client"/>
+     <component name="wimplugin" long-name="WIM Plugin"/>
      <component unofficial="yes" name="wim_build" long-name="WIM Build">
       <unit bldFile="mw/securitysrv/wim/group"/>
      </component>
     </collection>
     <collection name="cms" long-name="Certificate Management Services" level="generic">
-     <component name="CMS.Dll=binary" long-name="CMS">
+     <component name="cms_build" long-name="CMS">
       <unit bldFile="mw/securitysrv/cms/group"/>
      </component>
     </collection>
@@ -2369,41 +1325,41 @@
      <component name="x509certnameparser" long-name="X509cert Name Parser">
       <unit bldFile="mw/securitysrv/pkiutilities/x509certnameparser/group"/>
      </component>
-     <component name="PKCS12">
+     <component name="pkcs12">
       <unit bldFile="mw/securitysrv/pkiutilities/pkcs12/group"/>
      </component>
-     <component name="CertmanUi" long-name="Certman UI">
+     <component name="certmanui" long-name="Certman UI">
       <unit bldFile="mw/securitysrv/pkiutilities/certmanui/group"/>
      </component>
-     <component name="CTSecurityDialogs" long-name="CT Security Dialogs">
+     <component name="ctsecuritydialogs" long-name="CT Security Dialogs">
       <unit bldFile="mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
      </component>
-     <component name="CertSaver" long-name="Cert Saver">
+     <component name="certsaver" long-name="Cert Saver">
       <unit bldFile="mw/securitysrv/pkiutilities/certsaver/group"/>
      </component>
-     <component name="SecModUI" long-name="Sec Mod UI">
+     <component name="secmodui" long-name="Sec Mod UI">
       <unit bldFile="mw/securitysrv/pkiutilities/secmodui/group"/>
      </component>
-     <component name="DeviceToken" long-name="Device Token">
+     <component name="devicetoken" long-name="Device Token">
       <unit bldFile="mw/securitysrv/pkiutilities/devicetoken/group"/>
      </component>
-     <component name="Certificates">
+     <component name="certificates">
       <unit bldFile="mw/securitysrv/pkiutilities/certificates/group"/>
      </component>
-     <component name="Certificates_OEM"/>
+     <component name="certificates_oem"/>
      <component unofficial="yes" name="pkiutilities_build" long-name="PKI Utilities Build">
       <unit bldFile="mw/securitysrv/pkiutilities/group"/>
      </component>
     </collection>
     <collection name="remotelock" long-name="Remote Lock" level="server">
-     <component name="RemotelockSettings" long-name="Remote Lock Settings"/>
-     <component name="RemoteLockEngine" long-name="Remote Lock Engine"/>
+     <component name="remotelocksettings" long-name="Remote Lock Settings"/>
+     <component name="remotelockengine" long-name="Remote Lock Engine"/>
      <component unofficial="yes" name="remotelock_build" long-name="Remote Lock Build">
       <unit bldFile="mw/securitysrv/remotelock/group"/>
      </component>
     </collection>
     <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-     <component name="TrkDummy" long-name="Trk Dummy">
+     <component name="trkdummy" long-name="Trk Dummy">
       <!-- <unit bldFile="mw/securitysrv/boottimeintegritycheck/trkdummy/group"/> -->
      </component>
      <component unofficial="yes" name="boottimeintegritycheck_build" long-name="Boot Time Integrity Check Build">
@@ -2414,16 +1370,16 @@
      <component name="keylockpolicyapi" long-name="Keylock Policy Api">
       <unit bldFile="mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
      </component>
-     <component name="Autolock">
+     <component name="autolock">
       <unit bldFile="mw/securitysrv/securitydialogs/autolock/group"/>
      </component>
-     <component name="SecUi" long-name="Sec UI">
+     <component name="secui" long-name="Sec UI">
       <unit bldFile="mw/securitysrv/securitydialogs/secui/group"/>
      </component>
-     <component name="Securitynotifier" long-name="Security Notifier">
+     <component name="securitynotifier" long-name="Security Notifier">
       <unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
      </component>
-     <component name="Securityobserver" long-name="Security Observer">
+     <component name="securityobserver" long-name="Security Observer">
       <unit bldFile="mw/securitysrv/securitydialogs/securityobserver/group"/>
      </component>
      <component unofficial="yes" name="securitydialogs_build" long-name="Security Dialogs Build">
@@ -2431,56 +1387,14 @@
      </component>
     </collection>
     <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-     <component unofficial="yes" name="provisioning_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
-     </component>
-     <component unofficial="yes" name="cms_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
-     </component>
-     <component unofficial="yes" name="gba_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
-     </component>
-     <component unofficial="yes" name="remote_lock_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
-     </component>
-     <component unofficial="yes" name="x509certnameparser_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
-     </component>
-     <component unofficial="yes" name="devicelock_access_api">
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="keylock_policy_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="wim_cert_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
-     </component>
-     <component unofficial="yes" name="keyguard_configuration_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="lockapp_server_api">
-      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/> -->
-     </component>
      <component unofficial="yes" name="securitysrv_build" long-name="Security Services Build">
       <unit bldFile="mw/securitysrv/group"/>
      </component>
-     <component unofficial="yes" name="pkcs12_parser_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="keyguard_access_api">
+     <component unofficial="yes" name="secsrv_plat" class="api">
+      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/> -->
+      <unit bldFile="mw/securitysrv/secsrv_plat/group"/>
       <!-- <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="device_key_store_encryption_plugin_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="java_utils_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="pkidialog_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="security_code_ui_api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+      <!-- <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/> -->
      </component>
      <component unofficial="yes" name="securitysrv_test" long-name="Security Services Test">
       <!-- <unit bldFile="mw/securitysrv/tsrc/group"/> -->
@@ -2554,72 +1468,23 @@
       <unit bldFile="mw/drm/wmdrm/group"/>
      </component>
     </collection>
-    <collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
-     <component unofficial="yes" name="oma_drm_caf_agent_api">
-      <!-- <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
-      <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_license_checker_api">
+    <collection name="drm_info" long-name="DRM Info" level="specific">
+     <component unofficial="yes" name="drm_pub" long-name="DRM Public Interfaces" class="api">
+      <!-- <unit bldFile="mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/tsrc/group"/> -->
-      <unit bldFile="mw/drm/drm_pub/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">
+      <unit bldFile="mw/drm/drm_pub/group"/>
+      <!-- <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
+     </component>
+     <component unofficial="yes" name="drm_plat" long-name="DRM Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
+      <unit bldFile="mw/drm/drm_plat/group"/>
+      <!-- <unit bldFile="mw/drm/drm_plat/roap_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="drm_build" long-name="DRM Build">
       <unit bldFile="mw/drm/group"/>
      </component>
     </collection>
-    <collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
-     <component unofficial="yes" name="drm_plat_build" long-name="DRM Platform API Build">
-      <unit bldFile="mw/drm/drm_plat/group"/>
-     </component>
-     <component unofficial="yes" name="camese_utility_api">
-      <unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="camese_framework_api">
-      <unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_common_api">
-      <!-- <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">
-      <unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_legacy_api">
-      <unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
-     </component>
-     <component unofficial="yes" name="dcf_repository_api">
-      <unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
-     </component>
-     <component unofficial="yes" name="drm_utility_api">
-      <unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
-     </component>
-     <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">
-      <unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="accesssec" long-name="Access Security" tech_domain="se" level="generic" levels="plugin framework server generic specific">
     <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
@@ -2650,54 +1515,10 @@
       <unit bldFile="mw/accesssec/eapol/group"/>
      </component>
     </collection>
-    <collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-     <component unofficial="yes" name="eapsim_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eapleap_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eaptlspeap_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="wep_security_settings_ui_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="eap_type_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
-     </component>
-     <component unofficial="yes" name="wapi_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eap_vpn_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
-     </component>
-     <component unofficial="yes" name="wpa_security_settings_ui_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="accesssec_plat_build" long-name="Access Security Platform API Build">
+    <collection name="accesssec_info" long-name="Access Security Info" level="specific">
+     <component unofficial="yes" name="accesssec_plat" long-name="Access Security Platform Interfaces" class="api">
       <unit bldFile="mw/accesssec/accesssec_plat/group"/>
      </component>
-     <component unofficial="yes" name="eapmschapv2_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="eapgtc_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-     </component>
-     <component unofficial="yes" name="wi-fi_protected_setup_ui_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="wapi_security_settings_ui_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_eap_settings_ui_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="eapaka_db_api">
-      <unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-     </component>
-    </collection>
-    <collection name="accesssec_info" long-name="Access Security Info" level="specific">
      <component unofficial="yes" name="accesssec_build" long-name="Access Security Build">
       <unit bldFile="mw/accesssec/group"/>
      </component>
@@ -2782,154 +1603,67 @@
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/handlingprocesstest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity2_exe/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancellisttriggerstest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/createtest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity4_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelgettriggerstest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/modifytest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity5_exe/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelsettriggerstest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/canceldeletetest/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/deletetest/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
      </component>
      <component unofficial="yes" name="locationtriggering_build" long-name="Location Triggering Build">
       <unit bldFile="mw/locationsrv/locationtriggering/group"/>
      </component>
     </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/map_and_navigation_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
+     <component unofficial="yes" name="locsrv_plat" class="api">
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <unit bldFile="mw/locationsrv/locsrv_plat/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="supl_settings_notifier_secondary_display_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="privacy_notifiers_secondary_display_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_triggering_status_information_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_image_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_centre_registration_api">
-      <unit bldFile="mw/locationsrv/locsrv_pub/location_centre_registration_api/group"/>
-     </component>
-     <component unofficial="yes" name="landmarks_category_definition_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_centre_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="landmarks_database_management_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="np_proxy_configuration_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="genericpositioningplugins">
       <unit bldFile="mw/locationsrv/genericpositioningplugins/group"/>
      </component>
-     <component unofficial="yes" name="landmarks_search_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="supl_terminal_initiation_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
-     </component>
      <component unofficial="yes" name="locationsrv_test" long-name="Location Services Test">
       <!-- <unit bldFile="mw/locationsrv/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="location_triggering_api">
-      <unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_image_conversion_plugin_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
-     </component>
-     <component unofficial="yes" name="supl_pos_message_plugin_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
-      <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"/> -->
-     </component>
-     <component unofficial="yes" name="map_and_navigation_provider_discovery_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-     </component>
-     <component unofficial="yes" name="map_and_navigation_provider_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_supl_configuration_parameter_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="blid_application_satellite_info_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
-     </component>
      <component unofficial="yes" name="locationsrv_build" long-name="Location Services Build">
       <unit bldFile="mw/locationsrv/group"/>
      </component>
-     <component unofficial="yes" name="supl_query_secondary_display_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_triggering_management_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="location_settings_launch_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="landmarks_api">
+     <component unofficial="yes" name="locsrv_pub" class="api">
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
+      <unit bldFile="mw/locationsrv/locsrv_pub/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
       <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
-      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="map_and_navigation_aiw_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-     </component>
-     <component unofficial="yes" name="psy_configuration_ui_plugin_api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="supl_network_initiation_api">
-      <!-- <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
-      <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
+      <!-- <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
@@ -3018,65 +1752,14 @@
      </component>
     </collection>
     <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-     <component unofficial="yes" name="data_connection_log_counters_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
-     </component>
-     <component unofficial="yes" name="commsdat_wlan_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_monitor_server_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="disconnect_dialog_disable_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
-     </component>
-     <component unofficial="yes" name="agent_dialog_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="disconnect_dialog_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
-     </component>
      <component unofficial="yes" name="ipconnmgmt_build" long-name="IP Connectivity Management Build">
       <unit bldFile="mw/ipconnmgmt/group"/>
      </component>
-     <component unofficial="yes" name="connection_monitor_extension_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="access_point_engine_misc_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_settings_ui_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="access_point_engine_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_connection_settings_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_ui_utilities_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="access_point_settings_handler_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="bearer_settings_plugin_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="pdpcontextmanager2_settings_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpm_connect_screen_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_settings_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="pdpcontextmanager2_reset_factory_settings_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpm_default_connection_api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+     <component unofficial="yes" name="ipcm_pub" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/group"/>
+     </component>
+     <component unofficial="yes" name="ipcm_plat" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/group"/>
      </component>
     </collection>
    </block>
@@ -3114,24 +1797,13 @@
      </component>
     </collection>
     <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
+     <component unofficial="yes" name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" class="api">
+      <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
+     </component>
      <component unofficial="yes" name="netprotocols_build" long-name="High-level Internet Protocols Build">
       <unit bldFile="mw/netprotocols/group"/>
      </component>
     </collection>
-    <collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
-     <component unofficial="yes" name="http_cache_mgr_api">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
-     </component>
-     <component unofficial="yes" name="http_filters_api">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
-     </component>
-     <component unofficial="yes" name="netprotocols_plat_build" long-name="High-level Internet Protocols Platform API Build">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
-     </component>
-     <component unofficial="yes" name="cookie_manager_api">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="ipappprotocols" long-name="IP App Protocols" tech_domain="dc" level="generic" levels="plugin framework conn server">
     <collection name="rtp" long-name="RTP" level="server">
@@ -3165,18 +1837,13 @@
      </component>
     </collection>
     <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="server">
+     <component unofficial="yes" name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" class="api">
+      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/group"/>
+     </component>
      <component unofficial="yes" name="ipappprotocols_build" long-name="IP App Protocols Build">
       <unit bldFile="mw/ipappprotocols/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>
-     <component unofficial="yes" name="rtprtcp_api">
-      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="wirelessacc" long-name="Wireless Access" tech_domain="dc" level="specific" levels="framework generic ui">
     <collection name="hotspotfw" long-name="Hotspot Framework" level="framework">
@@ -3216,17 +1883,8 @@
      </component>
     </collection>
     <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
-     <component unofficial="yes" name="hotspot_framework_client_api">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="hotspot_framework_client_plugin_api">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_connectivity_test_service_api">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_connectivity_test_service_settings_api">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+     <component unofficial="yes" name="hsfw_plat" class="api">
+      <unit bldFile="mw/wirelessacc/hsfw_plat/group"/>
      </component>
      <component unofficial="yes" name="wirelessacc_build" long-name="Wireless Access Build">
       <unit bldFile="mw/wirelessacc/group"/>
@@ -3377,7 +2035,7 @@
      </component>
     </collection>
     <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-     <component name="vpnapi.dll=binary" long-name="VPN API">
+     <component name="vpnapi" long-name="VPN API">
       <unit bldFile="mw/vpnclient/vpnapiimpl/group"/>
      </component>
     </collection>
@@ -3388,7 +2046,7 @@
      <component unofficial="yes" name="vpnclient_build" long-name="VPN Client Build">
       <unit bldFile="mw/vpnclient/group"/>
      </component>
-     <component unofficial="yes" name="vpnapi">
+     <component unofficial="yes" name="vpnc_plat" class="api">
       <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group"/>
      </component>
     </collection>
@@ -3512,16 +2170,16 @@
      <component unofficial="yes" name="multimediacommsengine_test" long-name="Multimedia Comms Engine Test">
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
-      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/ttcnresolverplugin/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiengine/group"/> -->
       <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group/s60_public_sdk"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
+      <!-- <unit bldFile="mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
      </component>
     </collection>
     <collection name="natfw" long-name="NAT Framework" level="framework">
@@ -3594,30 +2252,13 @@
      </component>
     </collection>
     <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
+     <component unofficial="yes" name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" class="api">
+      <unit bldFile="mw/ipappsrv/ipappsrv_plat/group"/>
+     </component>
      <component unofficial="yes" name="ipappsrv_build" long-name="IP App Services Build">
       <unit bldFile="mw/ipappsrv/group"/>
      </component>
     </collection>
-    <collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="floor_control_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_control_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="nat_settings_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="transcoder_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
-     </component>
-     <component unofficial="yes" name="comms_event_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_comms_api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="phonesrv" long-name="Telephony and SIM Services" tech_domain="vc" level="specific" levels="plugin framework server generic specific">
     <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
@@ -3626,7 +2267,7 @@
      </component>
     </collection>
     <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-     <component name="CbsServer" long-name="CBS Server">
+     <component name="cbsserver" long-name="CBS Server">
       <unit bldFile="mw/phonesrv/cbs/cbsserver/group"/>
      </component>
      <component name="cbsui" long-name="CBS UI">
@@ -3664,7 +2305,7 @@
      </component>
     </collection>
     <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-     <component name="EnPolicy" long-name="En Policy">
+     <component name="enpolicy" long-name="En Policy">
       <unit bldFile="mw/phonesrv/phoneclientserver/enpolicy/group"/>
      </component>
      <component name="aiwdialdata" long-name="AIW Dial Data">
@@ -3679,12 +2320,12 @@
      <component name="phoneserver" long-name="Phones Erver">
       <unit bldFile="mw/phonesrv/phoneclientserver/phoneserver/group"/>
      </component>
-     <component name="CallUI" long-name="Call UI">
+     <component name="callui" long-name="Call UI">
       <unit bldFile="mw/phonesrv/phoneclientserver/callui/group"/>
      </component>
     </collection>
     <collection name="satengine" long-name="Sat Engine" level="generic">
-     <component name="SatServer" long-name="Sat Server">
+     <component name="satserver" long-name="Sat Server">
       <unit bldFile="mw/phonesrv/satengine/satserver/group"/>
      </component>
      <component unofficial="yes" name="satengine_build" long-name="Sat Engine Build">
@@ -3714,13 +2355,13 @@
      <component name="telephonysettings" long-name="Telephony Settings">
       <unit bldFile="mw/phonesrv/cellular/telephonysettings/group"/>
      </component>
-     <component name="SSSettings" long-name="SS Settings">
+     <component name="sssettings" long-name="SS Settings">
       <unit bldFile="mw/phonesrv/cellular/sssettings/group"/>
      </component>
-     <component name="PsetNotesUi" long-name="Pset Notes UI">
+     <component name="psetnotesui" long-name="Pset Notes UI">
       <unit bldFile="mw/phonesrv/cellular/psetnotesui/group"/>
      </component>
-     <component name="ServiceRequest" long-name="Service Request">
+     <component name="servicerequest" long-name="Service Request">
       <unit bldFile="mw/phonesrv/cellular/servicerequest/group"/>
      </component>
     </collection>
@@ -3730,132 +2371,25 @@
      </component>
     </collection>
     <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
+     <component unofficial="yes" name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
+      <unit bldFile="mw/phonesrv/phonesrv_plat/group"/>
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="phonesrv_pub" long-name="Telephony and SIM Services Public Interfaces" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_pub/group"/>
+     </component>
      <component unofficial="yes" name="phonesrv_build" long-name="Telephony and SIM Services Build">
       <unit bldFile="mw/phonesrv/group"/>
      </component>
     </collection>
-    <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="voice_mailbox_number_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
-     </component>
-     <component unofficial="yes" name="cbs_mcn_client_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_notify_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
-     </component>
-     <component unofficial="yes" name="converged_call_engine_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="dial_utils_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_ussd_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
-     </component>
-     <component unofficial="yes" name="default_emergency_numbers_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_observer_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_ussd_internal_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/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>
-     <component unofficial="yes" name="call_information_mediator_api">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
-      <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="cbs_message_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="voice_mailbox_settings_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_notes_ui_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_service_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="callui_reconnect_query_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
-     </component>
-     <component unofficial="yes" name="ss_settings_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_dial_data_consumer_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_image_handler_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="service_provider_settings_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="string_parser_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="converged_call_provider_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_network_information_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="secondary_display_sat_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
-     </component>
-     <component unofficial="yes" name="call_information_api">
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
-      <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="network_handling_engine_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_configuration_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_settings_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="cenrep_database_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_refresh_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group"/>
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="incoming_call_monitor_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_client_server_information_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="sat_client_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group"/>
-      <!-- <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="phone_client_utility_api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="messagingmw" long-name="Messaging Middleware" tech_domain="pr" level="specific" levels="stack fw api">
     <collection name="msgbranched" long-name="Messaging Branched" level="fw">
-     <component name="msgbranched.lib=binary">
+     <component name="msgbranched_build">
       <unit bldFile="mw/messagingmw/msgbranched/group"/>
      </component>
     </collection>
@@ -3964,27 +2498,17 @@
      <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/messagingmw/msgfw_pub/send_ui_api/group"/>
+     <component unofficial="yes" name="msgfw_pub" class="api">
+      <unit bldFile="mw/messagingmw/msgfw_pub/group"/>
       <!-- <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="always_online_client_api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="send_ui_datautils_api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
+      <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/tsrc/group"/>
      </component>
      <component unofficial="yes" name="messagingmw_build" long-name="Messaging Middleware Build">
       <unit bldFile="mw/messagingmw/group"/>
      </component>
-     <component unofficial="yes" name="always_online_plugin_api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="msg_common_utils_api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="send_ui_plugin_api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
+     <component unofficial="yes" name="msgfw_plat" class="api">
+      <unit bldFile="mw/messagingmw/msgfw_plat/group"/>
+      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/tsrc/group"/>
      </component>
     </collection>
    </block>
@@ -4035,6 +2559,8 @@
      <component unofficial="yes" name="ximpfw_test" long-name="XIMP Framework Test">
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/group"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatching"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcutils"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_rootservices"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceall"/> -->
@@ -4042,11 +2568,9 @@
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencecache"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencepublishing"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_sessionmng"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_presenceauthorization"/> -->
       <!-- <unit bldFile="mw/imsrv/ximpfw/tsrc/src/t_eunittemplate"/> -->
@@ -4064,104 +2588,30 @@
       <unit bldFile="mw/imsrv/brandingserver/group"/>
      </component>
     </collection>
-    <collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="ximp_search_protocol_plugin_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="presence_avabilitytext">
-      <unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_search_protocol_plugin_host_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_management_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_management_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_search_data_model_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_base_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_data_model_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_cache_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_protocol_plugin_host_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_protocol_plugin_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_protocol_plugin_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_protocol_plugin_host_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_search_base_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_data_model_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_data_model_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
-     </component>
-     <component unofficial="yes" name="xmpp_settings_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="im_cache_client_api">
+    <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
+     <component unofficial="yes" name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/group"/>
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/tsrc/group"/> -->
-      <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_base_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_core_feature_plugin_api">
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
-     </component>
-     <component unofficial="yes" name="ximp_search_management_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_im_base_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_protocol_plugin_host_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_management_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="ximp_presence_protocol_plugin_api">
-      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
-     </component>
-    </collection>
-    <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
+      <!-- <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="imsrv_build" long-name="Instant Messaging and Presence Services Build">
       <unit bldFile="mw/imsrv/group"/>
      </component>
@@ -4169,16 +2619,16 @@
    </block>
    <block name="legacypresence" long-name="Legacy Presence Services" tech_domain="pr" level="specific" levels="engine fw ui">
     <collection name="xdmengine" long-name="XDM Engine" level="engine">
-     <component name="XdmSettingsApi" long-name="XDM Settings Api">
+     <component name="xdmsettingsapi" long-name="XDM Settings Api">
       <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmsettingsapi/group"/> -->
      </component>
-     <component name="XdmProvisioning" long-name="XDM Provisioning">
+     <component name="xdmprovisioning" long-name="XDM Provisioning">
       <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmprovisioning/group"/> -->
      </component>
-     <component name="XdmDeviceManagement" long-name="XDM Device Management">
+     <component name="xdmdevicemanagement" long-name="XDM Device Management">
       <!-- <unit bldFile="mw/legacypresence/xdmengine/xdmdevicemanagement/group"/> -->
      </component>
-     <component unofficial="yes" name="xdmengine_build" long-name="XDM Engine Build">
+     <component name="xdmengine_build" long-name="XDM Engine">
       <unit bldFile="mw/legacypresence/xdmengine/group"/>
      </component>
     </collection>
@@ -4191,12 +2641,12 @@
      </component>
     </collection>
     <collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-     <component name="msgconnmanager.dll=binary">
+     <component name="msgconnmanager_build">
       <unit bldFile="mw/legacypresence/msgconnmanager/group"/>
      </component>
     </collection>
     <collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptor" level="fw">
-     <component name="simpleplugin.dll=binary">
+     <component name="simpleplugin">
       <unit bldFile="mw/legacypresence/presencefwsimpleadpt/group"/>
      </component>
     </collection>
@@ -4235,10 +2685,10 @@
      </component>
     </collection>
     <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
-     <component name="XdmXmlParser" long-name="XDM XML Parser">
+     <component name="xdmxmlparser" long-name="XDM XML Parser">
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xdmxmlparser/group"/> -->
      </component>
-     <component name="XcapProtocol" long-name="Xcap Protocol">
+     <component name="xcapprotocol" long-name="Xcap Protocol">
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapappusage/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/client/group"/> -->
@@ -4247,7 +2697,7 @@
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcapoperations/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/xcapprotocol/xcaputils/group"/> -->
      </component>
-     <component name="LocalProtocol" long-name="Local Protocol">
+     <component name="localprotocol" long-name="Local Protocol">
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/group"/> -->
       <!-- <unit bldFile="mw/legacypresence/xdmprotocols/localprotocol/localoperations/group"/> -->
      </component>
@@ -4256,55 +2706,19 @@
      </component>
     </collection>
     <collection name="simpledatamodeladapter" long-name="SIMPLE Data Mode Aadapter" level="fw">
-     <component name="presenceplugin.dll=binary">
+     <component name="presenceplugin">
       <unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
      </component>
     </collection>
     <collection name="legacypresence_info" long-name="Legacy Presence Services Info" level="ui">
-     <component unofficial="yes" name="xdm_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
-     </component>
-     <component unofficial="yes" name="watcher_info_api">
-      <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>
-     <component unofficial="yes" name="authorization_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
-     </component>
-     <component unofficial="yes" name="simple_documents_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
-     </component>
-     <component unofficial="yes" name="xdm_protocol_plugin_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="registration_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
-     </component>
-     <component unofficial="yes" name="xdm_settings_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="presence_list_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="watcher_api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
+     <component unofficial="yes" name="pressrv_plat" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="opensrv" long-name="Open Services" tech_domain="rt" level="specific" levels="prt lib server eng">
     <collection name="loudmouth" long-name="Loudmouth" level="prt">
-     <component unofficial="yes" name="loudmouth_build" long-name="Loudmouth Build">
+     <component name="loudmouth_build">
       <unit bldFile="mw/opensrv/loudmouth/group"/>
      </component>
      <component unofficial="yes" name="loudmouth_test" long-name="Loudmouth Test">
@@ -4312,7 +2726,7 @@
      </component>
     </collection>
     <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-     <component unofficial="yes" name="libtelepathy_build" long-name="Telepathy Library Build">
+     <component name="libtelepathy_build">
       <unit bldFile="mw/opensrv/libtelepathy/group"/>
      </component>
      <component unofficial="yes" name="libtelepathy_test" long-name="Telepathy Library Test">
@@ -4339,19 +2753,14 @@
      </component>
     </collection>
     <collection name="opensrv_info" long-name="Open Services Info" level="eng">
+     <component unofficial="yes" name="opensrv_plat" long-name="Open Services Platform Interfaces" class="api">
+      <unit bldFile="mw/opensrv/opensrv_plat/group"/>
+      <!-- <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="opensrv_build" long-name="Open Services Build">
       <unit bldFile="mw/opensrv/group"/>
      </component>
     </collection>
-    <collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-     <component unofficial="yes" name="opensrv_plat_build" long-name="Open Services Platform API Build">
-      <unit bldFile="mw/opensrv/opensrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="messagequeue_api">
-      <!-- <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
-      <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="remotemgmt" long-name="Remote Management" tech_domain="dm" level="specific" levels="plugin framework server generic specific">
     <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
@@ -4452,7 +2861,7 @@
      </component>
     </collection>
     <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-     <component name="SCP">
+     <component name="scp">
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
       <unit bldFile="mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
@@ -4487,140 +2896,30 @@
       <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="ahleclient" long-name="Adaptive History List Client"/>
-    </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>
-     <component unofficial="yes" name="fotaapplication">
-      <unit bldFile="mw/remotemgmt/fotaapplication/group"/>
-     </component>
-    </collection>
-    <collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
-     <component unofficial="yes" name="synchronization_capability_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
-     </component>
-    </collection>
-    <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">
+     <component unofficial="yes" name="remotemgmt_pub" long-name="Remote Management Public Interfaces" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_pub/group"/>
+     </component>
+     <component unofficial="yes" name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
-     </component>
-     <component unofficial="yes" name="dm_constant_definitions_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="oma_provisioning_adapter_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
-     </component>
-     <component unofficial="yes" name="data_synchronization_plugin_api">
-      <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/dm_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/group"/>
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="diagnostics_results_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
-     </component>
-     <component unofficial="yes" name="data_synchronization_notification_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="ds_constant_definitions_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="update_package_storage_plugin_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="diagnostics_plugin_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/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/pnpms_utils_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
-      <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>
-     <component unofficial="yes" name="diagnostics_plugin_pool_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-     </component>
-     <component unofficial="yes" name="sync_alert_handler_api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
-     </component>
-     <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>
@@ -4680,7 +2979,7 @@
      <component name="remotefilesystemplugin" long-name="Remote Filesystem Plugin">
       <unit bldFile="mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
      </component>
-     <component name="gsplugin" long-name="GS Plugin">
+     <component name="remotestoragegsplugin" long-name="GS Plugin">
       <unit bldFile="mw/remotestorage/remotestoragefw/gsplugin/group"/>
      </component>
      <component name="remotedriveconfigurationbiocontrol" long-name="Remote Drive Configuration BIO Control">
@@ -4691,14 +2990,14 @@
      </component>
     </collection>
     <collection name="remotestorage_info" long-name="Remote Storage Info" level="framework">
-     <component unofficial="yes" name="rsfw_access_protocol_plugin_api">
+     <component unofficial="yes" name="rsfw_plat" class="api">
       <unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
      </component>
     </collection>
    </block>
    <block name="remoteconn" long-name="Remote Connectivity" tech_domain="de" level="generic" levels="plugin framework server generic specific">
     <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-     <component name="SeCon" long-name="Se Con">
+     <component name="secon" long-name="Se Con">
       <unit bldFile="mw/remoteconn/connectivitymodules/secon/group"/>
      </component>
     </collection>
@@ -4706,6 +3005,9 @@
      <component unofficial="yes" name="remoteconn_build" long-name="Remote Connectivity Build">
       <unit bldFile="mw/remoteconn/group"/>
      </component>
+     <component unofficial="yes" name="remoteconn_plat" long-name="Remote Connectivity Platform Interfaces" class="api">
+      <unit bldFile="mw/remoteconn/remoteconn_plat/group"/>
+     </component>
     </collection>
    </block>
    <block name="dlnasrv" long-name="DLNA Services" tech_domain="de" level="specific" levels="framework server plugin">
@@ -4897,58 +3199,15 @@
      </component>
     </collection>
     <collection name="homemedia" long-name="Home Media" level="framework">
-     <component name="homemedia" long-name="Home Media">
-      <unit bldFile="mw/dlnasrv/homemedia/homemedia/group"/>
-     </component>
-     <component unofficial="yes" name="homemedia_build" long-name="Home Media Build">
+     <component name="homemedia_build" long-name="Home Media">
       <unit bldFile="mw/dlnasrv/homemedia/group"/>
      </component>
-    </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/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_media_server_settings_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_security_plugin_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_control_point_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_control_point_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_av_objects_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_device_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="upnp_utils_api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_utils_api/group"/>
-     </component>
+     
     </collection>
     <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
+     <component unofficial="yes" name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" class="api">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/group"/>
+     </component>
      <component unofficial="yes" name="dlnasrv_build" long-name="DLNA Services Build">
       <unit bldFile="mw/dlnasrv/group"/>
      </component>
@@ -5075,116 +3334,25 @@
      <component name="imageprintuiprovider" long-name="ImagePrint UI Provider">
       <unit bldFile="mw/shortlinkconn/usbuis/imageprintuiprovider/group"/>
      </component>
-     <component name="imageprintui" long-name="ImagePrint UI">
+     <component name="usbimageprintui" long-name="ImagePrint UI">
       <unit bldFile="mw/shortlinkconn/usbuis/imageprintui/group"/>
      </component>
     </collection>
-    <collection name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" level="plugin">
-     <component unofficial="yes" name="bluetooth_power_state_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/bluetooth_power_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_notifier_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/bluetooth_notifier_api/group"/>
-     </component>
-    </collection>
     <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
+     <component unofficial="yes" name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" class="api">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_pub/group"/>
+     </component>
      <component unofficial="yes" name="public">
       <!-- <unit bldFile="mw/shortlinkconn/tsrc/public/basic/group"/> -->
      </component>
+     <component unofficial="yes" name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/group"/>
+     </component>
      <component unofficial="yes" name="shortlinkconn_build" long-name="Shortlink Connectivity Build">
       <unit bldFile="mw/shortlinkconn/group"/>
      </component>
     </collection>
-    <collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="bluetooth_engine_settings_api">
-      <!-- <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialup_connection_status_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_dosserver_audio_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_dosserver_audio_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_watcher_info_api_header">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_watcher_info_api_header/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_sap_connection_state_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_sap_connection_state_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_notifier_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_notifier_api/group"/>
-     </component>
-     <component unofficial="yes" name="pictbridge_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/pictbridge_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_transport_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_transport_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_device_management_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_device_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_device_control_plugin_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_device_control_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_notifier_internal_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_notifier_internal_api/group"/>
-     </component>
-     <component unofficial="yes" name="at_command_handler_plugin_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/at_command_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_connection_management_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_connection_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_watcher_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_watcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="obex_secondary_display_notification_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_personality_plugin_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_personality_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_responder_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_responder_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_secondary_display_notification_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="dun_secondary_display_notification_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_discovery_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_discovery_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_dut_mode_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_dut_mode_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_local_variation_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_local_variation_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_personality_api_header">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_personality_api_header/group"/>
-     </component>
-     <component unofficial="yes" name="obex_service_plugin_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="usb_secondary_display_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptp_server_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/ptp_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="obex_service_utils_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
-     </component>
-     <component unofficial="yes" name="bluetooth_engine_plugin_api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_plugin_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="imghandling" long-name="Image Handling" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
     <collection name="3gplibrary" long-name="3GP Library" level="server">
@@ -5197,7 +3365,7 @@
      </component>
     </collection>
     <collection name="imagehandlinglib" long-name="Image Handling Library" level="generic">
-     <component name="IHL.dll=binary" long-name="IHL">
+     <component name="ihl" long-name="IHL">
       <unit bldFile="mw/imghandling/imagehandlinglib/group"/>
      </component>
     </collection>
@@ -5216,29 +3384,14 @@
      </component>
     </collection>
     <collection name="imghandling_info" long-name="Image Handling Info" level="specific">
-     <component unofficial="yes" name="tvoutengine_api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/tvoutengine_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_handling_library_api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
-     </component>
-     <component unofficial="yes" name="3gp_library_api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+     <component unofficial="yes" name="imagehandling_plat" class="api">
       <!-- <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="image_info_popup_api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/image_info_popup_api/group"/>
+      <unit bldFile="mw/imghandling/imagehandling_plat/group"/>
+      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
      </component>
      <component unofficial="yes" name="imghandling_build" long-name="Image Handling Build">
       <unit bldFile="mw/imghandling/group"/>
      </component>
-     <component unofficial="yes" name="thumbnailmanager_api">
-      <!-- <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
-      <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_preview_api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/image_preview_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="metadatasrv" long-name="Legacy Metadata Services" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
@@ -5257,38 +3410,16 @@
       <unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
      </component>
     </collection>
-    <collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
-     <component unofficial="yes" name="metadatasrv_plat_build" long-name="Legacy Metadata Services Platform API Build">
+    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
+     <component unofficial="yes" name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" class="api">
       <unit bldFile="mw/metadatasrv/metadatasrv_plat/group"/>
      </component>
-     <component unofficial="yes" name="content_listing_framework_extended_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_fetch_implementation_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
-     </component>
-     <component unofficial="yes" name="content_listing_framework_collection_manager_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_style_grid_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_style_grid_api/group"/>
-     </component>
-    </collection>
-    <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
-     <component unofficial="yes" name="content_listing_framework_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/content_listing_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="metadatasrv_pub_build" long-name="Legacy Metadata Services Public API Build">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
-     </component>
-     <component unofficial="yes" name="media_fetch_api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
-     </component>
-    </collection>
-    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
      <component unofficial="yes" name="metadatasrv_build" long-name="Legacy Metadata Services Build">
       <unit bldFile="mw/metadatasrv/group"/>
      </component>
+     <component unofficial="yes" name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" class="api">
+      <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
+     </component>
     </collection>
    </block>
    <block name="mds" long-name="Metadata Services" tech_domain="mm" level="specific" levels="mgr eng server int">
@@ -5364,7 +3495,7 @@
      </component>
     </collection>
     <collection name="watchdog" long-name="Watchdog" level="server">
-     <component name="mdswatchdog.exe=binary">
+     <component name="mdswatchdog">
       <unit bldFile="mw/mds/watchdog/group"/>
      </component>
     </collection>
@@ -5373,56 +3504,31 @@
       <!-- <unit bldFile="mw/mds/iadstoprestart/group"/> -->
      </component>
     </collection>
-    <collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
-     <component unofficial="yes" name="content_listing_framework_api">
-      <unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group"/>
-     </component>
-     <component unofficial="yes" name="mds_pub_build" long-name="Metadata Services Public API Build">
+    <collection name="mds_info" long-name="Metadata Services Info" level="int">
+     <component unofficial="yes" name="mds_pub" long-name="Metadata Services Public Interfaces" class="api">
       <unit bldFile="mw/mds/mds_pub/group"/>
      </component>
-    </collection>
-    <collection name="mds_info" long-name="Metadata Services Info" level="int">
+     <component unofficial="yes" name="mds_plat" long-name="Metadata Services Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
+      <unit bldFile="mw/mds/mds_plat/group"/>
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="mds_build" long-name="Metadata Services Build">
       <unit bldFile="mw/mds/group"/>
      </component>
     </collection>
-    <collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
-     <component unofficial="yes" name="mds_plat_build" long-name="Metadata Services Platform API Build">
-      <unit bldFile="mw/mds/mds_plat/group"/>
-     </component>
-     <component unofficial="yes" name="location_manager_api">
-      <unit bldFile="mw/mds/mds_plat/location_manager_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="harvester_framework_api">
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
-      <unit bldFile="mw/mds/mds_plat/harvester_framework_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
-      <!-- <unit bldFile="mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="content_listing_framework_extended_api">
-      <unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="content_listing_framework_collection_manager_api">
-      <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="metadata_engine_api">
-      <unit bldFile="mw/mds/mds_plat/metadata_engine_api/group"/>
-      <!-- <unit bldFile="mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="context_engine_plugin_api">
-      <!-- <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
-      <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="mmuifw" long-name="Multimedia UI Framework" tech_domain="mm" level="specific" levels="mgr mdl util ui">
     <collection name="alfwidgetutils" long-name="ALF Widget Utils" level="ui">
-     <component name="alfwidgetutils.dll=binary" long-name="ALF Widget Utils Component">
+     <component name="alfwidgetutils_build" long-name="ALF Widget Utils Component">
       <unit bldFile="mw/mmuifw/alfwidgetutils/group"/>
      </component>
     </collection>
@@ -5459,15 +3565,13 @@
      </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>
-     <component unofficial="yes" name="osncore_build" long-name="OSN Core Build">
+     <component name="osncore_build" long-name="OSN Core">
       <unit bldFile="mw/mmuifw/osncore/group"/>
      </component>
+     
     </collection>
     <collection name="resourcepool" long-name="Resource Pool" level="util">
-     <component name="alfresourcepool.dll=binary" long-name="ALF Resource Pool">
+     <component name="alfresourcepool" long-name="ALF Resource Pool">
       <unit bldFile="mw/mmuifw/resourcepool/group"/>
      </component>
     </collection>
@@ -5483,70 +3587,23 @@
      </component>
     </collection>
     <collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
+     <component unofficial="yes" name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/group"/>
+     </component>
      <component unofficial="yes" name="mmuifw_build" long-name="Multimedia UI Framework Build">
       <unit bldFile="mw/mmuifw/group"/>
      </component>
     </collection>
-    <collection name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" level="ui">
-     <component unofficial="yes" name="alf_containerwidget_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="gesturehelper_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_resourcepool_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_customlayoutmanagers_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_sliderwidget_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_widgetmodel_api">
-      <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_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="alf_widgetfactory_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
-     </component>
-     <component unofficial="yes" name="osn_string_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
-     </component>
-     <component unofficial="yes" name="osn_global_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_datamodel_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
-     </component>
-     <component unofficial="yes" name="osn_container_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
-     </component>
-     <component unofficial="yes" name="mul_coverflowwidget_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_viewwidget_api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="videoutils" long-name="Video Utils" tech_domain="mm" level="specific" levels="empty eng util">
     <collection name="dvrengine" long-name="DVR Engine" level="eng">
-     <component name="CommonRecordingEngine" long-name="Common Recording Engine">
+     <component name="commonrecordingengine" long-name="Common Recording Engine">
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliphandler/group"/>
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliprecognizer/group"/>
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/dvrrtputils/group"/>
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengine/group"/>
      </component>
-     <component name="CommonRecordingEngineClient" long-name="Common Recording Engine Client">
+     <component name="commonrecordingengineclient" long-name="Common Recording Engine Client">
       <unit bldFile="mw/videoutils/dvrengine/commonrecordingengineclient/group"/>
      </component>
      <component unofficial="yes" name="dvrengine_build" long-name="DVR Engine Build">
@@ -5562,36 +3619,25 @@
      </component>
     </collection>
     <collection name="videoscheduler" long-name="Video Scheduler" level="util">
-     <component name="SchedulerClient" long-name="Scheduler Client">
+     <component name="schedulerclient" long-name="Scheduler Client">
       <unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
      </component>
-     <component name="SchedulerServer" long-name="Scheduler Server">
+     <component name="schedulerserver" long-name="Scheduler Server">
       <unit bldFile="mw/videoutils/videoscheduler/schedulerserver/group"/>
      </component>
      <component unofficial="yes" name="videoscheduler_build" long-name="Video Scheduler Build">
       <unit bldFile="mw/videoutils/videoscheduler/group"/>
      </component>
     </collection>
-    <collection name="videoutils_plat" long-name="Video Utils Platform Interfaces" level="util">
-     <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">
+    <collection name="videoutils_info" long-name="Video Utils Info" level="util">
+     <component unofficial="yes" name="videoutils_plat" long-name="Video Utils Platform Interfaces" class="api">
       <unit bldFile="mw/videoutils/videoutils_plat/group"/>
-     </component>
-     <component unofficial="yes" name="videoconnutility_api">
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxconnutiltestexe/group"/> -->
       <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestcommon/group"/> -->
       <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestutilmodule/group"/> -->
-      <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
-      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="videoutils_info" long-name="Video Utils Info" level="util">
+      <!-- <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="videoutils_build" long-name="Video Utils Build">
       <unit bldFile="mw/videoutils/group"/>
      </component>
@@ -5664,11 +3710,11 @@
      </component>
     </collection>
     <collection name="metadatautility" long-name="Metadata Utility" level="generic">
-     <component name="3GPExtParserLib"/>
-     <component name="3GPExtParserLib_stub">
+     <component name="3gpextparserlib"/>
+     <component name="3gpextparserlib_stub">
       <unit bldFile="mw/mmmw/metadatautility/3gpextparserlib_stub/group"/>
      </component>
-     <component unofficial="yes" name="metadatautility_build" long-name="Metadata Utility Build">
+     <component name="metadatautility_build">
       <unit bldFile="mw/mmmw/metadatautility/group"/>
      </component>
     </collection>
@@ -5703,7 +3749,7 @@
      </component>
     </collection>
     <collection name="thumbnailengine" long-name="Thumbnail Engine" level="server">
-     <component name="TNEEngine.dll=binary" long-name="TNE Engine">
+     <component name="tneengine" long-name="TNE Engine">
       <unit bldFile="mw/mmmw/thumbnailengine/group"/>
      </component>
     </collection>
@@ -5723,82 +3769,14 @@
      <component unofficial="yes" name="mmmw_test" long-name="Multimedia Middleware Test">
       <!-- <unit bldFile="mw/mmmw/tsrc/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"/>
-     </component>
-     <component unofficial="yes" name="progressive_download_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_buffer_source_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="call_audio_control_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_descriptor_source_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_balance_effect_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
-     </component>
-     <component unofficial="yes" name="stream_control_custom_command_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_volume_effect_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_file_source_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_progressive_download_source_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_audio_effects_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
-     </component>
-     <component unofficial="yes" name="mtp_keys_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/mtp_keys_api/group"/>
-     </component>
-     <component unofficial="yes" name="configuration_components_factory_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
-     </component>
-     <component unofficial="yes" name="mtp_wmdrm_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/mtp_wmdrm_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_metadata_reader_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
-     </component>
-     <component unofficial="yes" name="voip_audio_services_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="thumbnail_engine_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="emc_drm_config_intfc_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
-     </component>
-     <component unofficial="yes" name="equalizer_ui_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_data_source_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
-     </component>
-     <component unofficial="yes" name="radio_preset_utilities_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_output_control_utility_proxy_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
-     </component>
-     <component unofficial="yes" name="radio_monitor_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
-     </component>
-     <component unofficial="yes" name="radio_utilities_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_output_control_utility_api">
-      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+     <component unofficial="yes" name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/tsrc/group"/>
      </component>
     </collection>
    </block>
@@ -5811,10 +3789,10 @@
    </block>
    <block name="camerasrv" long-name="Camera Services" tech_domain="mm" level="specific" levels="plugin fw api">
     <collection name="camappengine" long-name="Camera App Engine" level="fw">
-     <component name="StillConverter" long-name="Still Converter">
+     <component name="stillconverter" long-name="Still Converter">
       <!-- <unit bldFile="mw/camerasrv/camappengine/stillconverter/group"/> -->
      </component>
-     <component name="Engine">
+     <component name="camappengine_engine">
       <!-- <unit bldFile="mw/camerasrv/camappengine/engine/group"/> -->
      </component>
      <component name="asynchfilesavequeue" long-name="Asynch File Save Queue">
@@ -5849,40 +3827,17 @@
      </component>
     </collection>
     <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
+     <component unofficial="yes" name="camerasrv_plat" long-name="Camera Services Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
+      <unit bldFile="mw/camerasrv/camerasrv_plat/group"/>
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="camerasrv_build" long-name="Camera Services Build">
       <unit bldFile="mw/camerasrv/group"/>
      </component>
     </collection>
-    <collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
-     <component unofficial="yes" name="media_recorder_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group"/>
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="custom_onboard_camera_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_recorder_sink_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
-     </component>
-     <component unofficial="yes" name="asynchronous_file_saving_queue_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group"/>
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="3gp_file_composer_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
-     </component>
-     <component unofficial="yes" name="camera_application_engine_api">
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
-      <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="cae_extentension_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
-     </component>
-     <component unofficial="yes" name="imaging_configuration_manager_api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group"/>
-      <!-- <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
-     </component>
-    </collection>
    </block>
    <block name="mmappfw" long-name="Multimedia App Framework" tech_domain="mm" level="specific" levels="empty fw utils">
     <collection name="mmappcomponents" long-name="MM App Components" level="utils">
@@ -5892,7 +3847,7 @@
      <component name="playlistengine" long-name="Playlist Engine">
       <unit bldFile="mw/mmappfw/mmappcomponents/playlistengine/group"/>
      </component>
-     <component name="harvester" long-name="Harvester">
+     <component name="mmappfwharvester" long-name="Harvester">
       <unit bldFile="mw/mmappfw/mmappcomponents/harvester/group"/>
      </component>
      <component name="mmappcommonui" long-name="MM App Common UI">
@@ -5916,10 +3871,10 @@
      <component name="playbackframework" long-name="Playback Framework">
       <unit bldFile="mw/mmappfw/mpx/playbackframework/group"/>
      </component>
-     <component name="collectionframework" long-name="Collection Framework">
+     <component name="mpxcollectionfw" long-name="Collection Framework">
       <unit bldFile="mw/mmappfw/mpx/collectionframework/group"/>
      </component>
-     <component name="viewframework" long-name="View Framework">
+     <component name="mpxviewfw" long-name="View Framework">
       <unit bldFile="mw/mmappfw/mpx/viewframework/group"/>
      </component>
      <component unofficial="yes" name="mpx_build" long-name="MPX Build">
@@ -5933,61 +3888,21 @@
      <component unofficial="yes" name="mmappfw_test" long-name="Multimedia App Framework Test">
       <!-- <unit bldFile="mw/mmappfw/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="utils">
-     <component unofficial="yes" name="mpx_albumart_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="asx_parser_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="collection_helper_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
-     </component>
-     <component unofficial="yes" name="mmappfw_plat_build" long-name="Multimedia App Framework Platform API Build">
+     <component unofficial="yes" name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/tsrc/group"/>
       <unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_playback_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_player_settings_engine_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_metadata_extractor_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_collection_mediator_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_common_definition_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="playlist_engine_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_playback_common_definition_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_backstepping_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_server_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_base_view_plugins_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_collection_common_definition_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_view_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_collection_utility_api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/tsrc/group"/>
+      <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/tsrc/group"/>
      </component>
     </collection>
    </block>
@@ -5996,7 +3911,7 @@
      <component name="ptienginev2" long-name="PTI Engine V2">
       <unit bldFile="mw/inputmethods/textinput/ptienginev2/group"/>
      </component>
-     <component name="AknInputLanguage" long-name="Akn Input Language">
+     <component name="akninputlanguage" long-name="Akn Input Language">
       <unit bldFile="mw/inputmethods/textinput/akninputlanguage/group"/>
      </component>
      <component name="peninputarc" long-name="Pen Input Arc">
@@ -6040,7 +3955,7 @@
      <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn">
       <unit bldFile="mw/inputmethods/textinput/peninputhwrfscn/group"/>
      </component>
-     <component name="Matsutake" long-name="Matsutake"/>
+     <component name="matsutake" long-name="Matsutake"/>
      <component unofficial="yes" name="textinput_build" long-name="Text Input Build">
       <unit bldFile="mw/inputmethods/textinput/group"/>
      </component>
@@ -6064,55 +3979,21 @@
      </component>-->
     </collection>
     <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
+     <component unofficial="yes" name="inputmethods_plat" long-name="Input Methods Platform Interfaces" class="api">
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
+      <unit bldFile="mw/inputmethods/inputmethods_plat/group"/>
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build">
       <unit bldFile="mw/inputmethods/group"/>
      </component>
-    </collection>
-    <collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="framework">
-     <component unofficial="yes" name="aknfep_status_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="ptiengine_indic_definitions_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_settings_api">
-      <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_hwr_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group"/>
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="aknfep_uiinterface_api">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_definitions_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="pen_input_server_api">
-      <!-- <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="aknfep_pen_support_api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
-     </component>
-    </collection>
-    <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="framework">
-     <component unofficial="yes" name="input_language_info_api">
+     <component unofficial="yes" name="inputmethods_pub" long-name="Input Methods Public Interfaces" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_pub/group"/>
       <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
-     </component>
-     <component unofficial="yes" name="optical_character_recognition_api">
-      <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
       <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="ptiengine_iti_api">
       <!-- <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
-      <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
      </component>
     </collection>
    </block>
@@ -6121,33 +4002,33 @@
      <component name="pslnengine" long-name="Personalization Engine">
       <!-- <unit bldFile="mw/classicui/psln/pslnengine/group"/> -->
      </component>
-     <component name="PslnFramework" long-name="Personalization Framework">
+     <component name="pslnframework" long-name="Personalization Framework">
       <!-- <unit bldFile="mw/classicui/psln/pslnframework"/> -->
      </component>
-     <component name="PslnLibraryLoaders" long-name="Personalization Library Loaders"/>
+     <component name="pslnlibraryloaders" long-name="Personalization Library Loaders"/>
      <component name="pslnslidesetdialog" long-name="Personalization Slideset Dialog">
       <!-- <unit bldFile="mw/classicui/psln/pslnslidesetdialog/group"/> -->
      </component>
-     <component name="PslnGSPlugin" long-name="Personalizaion GS Plugin">
+     <component name="pslngsplugin" long-name="Personalizaion GS Plugin">
       <unit bldFile="mw/classicui/psln/pslngsplugin/group"/>
      </component>
      <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">
+     <component name="psln_build" long-name="Psln">
       <unit bldFile="mw/classicui/psln/group"/>
      </component>
     </collection>
     <collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-     <component name="ServiceHandler" long-name="Service Handler">
+     <component name="aifwservicehandler" long-name="Service Handler">
       <unit bldFile="mw/classicui/applicationinterworkingfw/servicehandler/group"/>
      </component>
     </collection>
     <collection name="commonuis" long-name="Common UIs" level="specific">
-     <component name="CommonUi" long-name="Common UI">
+     <component name="commonui" long-name="Common UI">
       <unit bldFile="mw/classicui/commonuis/commonui/group"/>
      </component>
-     <component name="CommonDialogs" long-name="Common Dialogs">
+     <component name="commondialogs" long-name="Common Dialogs">
       <unit bldFile="mw/classicui/commonuis/commondialogs/group"/>
       <!-- <unit bldFile="mw/classicui/commonuis/commondialogs/group_test"/> -->
      </component>
@@ -6159,7 +4040,7 @@
      <component name="eikctl" long-name="Eikctl">
       <unit bldFile="mw/classicui/uifw/eikctl/group"/>
      </component>
-     <component name="AvKon" long-name="AvKon">
+     <component name="avkon" long-name="AvKon">
       <!-- <unit bldFile="mw/classicui/uifw/avkon/aknhlist/group"/> -->
       <!-- <unit bldFile="mw/classicui/uifw/avkon/aknkeyrotator/group"/> -->
       <unit bldFile="mw/classicui/uifw/avkon/aknphysics/group"/>
@@ -6168,10 +4049,10 @@
       <!-- <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">
+     <component name="eikstd" long-name="EikStd">
       <unit bldFile="mw/classicui/uifw/eikstd/group"/>
      </component>
-     <component name="AknGlobalUI" long-name="Avkon Global UI">
+     <component name="aknglobalui" long-name="Avkon Global UI">
       <unit bldFile="mw/classicui/uifw/aknglobalui/group"/>
      </component>
      <component name="ganes" long-name="Ganes">
@@ -6181,13 +4062,13 @@
       <!-- <unit bldFile="mw/classicui/uifw/tsrc/group"/> -->
      </component>
     </collection>
-    <collection name="CommonAdapter" long-name="Common Adapter" level="support">
-     <component name="commonadapter.dll=binary">
+    <collection name="commonadapter" long-name="Common Adapter" level="support">
+     <component name="commonadapter_build">
       <unit bldFile="mw/classicui/commonadapter/group"/>
      </component>
     </collection>
     <collection name="ode" long-name="Open Dynamics Engine" level="support">
-     <component name="ode.dll=binary">
+     <component name="ode_build">
       <unit bldFile="mw/classicui/ode/group"/>
      </component>
     </collection>
@@ -6195,475 +4076,147 @@
      <component unofficial="yes" name="classicui_build" long-name="Classic UI Build">
       <unit bldFile="mw/classicui/group"/>
      </component>
-     <component unofficial="yes" name="classicui_test" long-name="Classic UI Test">
-      <!-- <unit bldFile="mw/classicui/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
-     <component unofficial="yes" name="global_window_priorities_api">
-      <unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_provider_utility_api">
-      <unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_api">
-      <unit bldFile="mw/classicui/classicui_plat/alarm_api/group"/>
-     </component>
-     <component unofficial="yes" name="signal_pane_api">
-      <unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="long_tap_animation_api">
-      <unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_file_dialogs_filter_factory_api">
-      <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="special_character_table_api">
-      <unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_utilities_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_utilities_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">
+     <component unofficial="yes" name="classicui_pub" long-name="Classic UI Public Interfaces" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/animation_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/application_framework_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/base_controls_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/buttons_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/choice_list_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/context_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/dialogs_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/document_handler_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/editors_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/error_ui_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/fonts_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/form_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/generic_button_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/grids_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/hotkeys_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/images_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/indicators_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/initialization_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/input_frame_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/keylock_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/labels_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/lists_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/misc_controls_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/notes_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/notifiers_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/options_menu_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/popups_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/queries_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/screen_mode_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/screen_saver_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/scroller_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/searchfield_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/server_application_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/setting_pages_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/slider_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/sounds_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/status_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/tabs_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/title_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/toolbar_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group"/>
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.2/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_sdk5.0/group"/> -->
+      <!-- <unit bldFile="mw/classicui/classicui_pub/tsrc/bc/group"/> -->
+      <unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/volume_control_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="classicui_plat" long-name="Classic UI Platform Interfaces" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/alarm_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/application_switching_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group"/>
+      <!-- <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/tsrc/group"/> -->
+      <unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/battery_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_animation_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_editors_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_grids_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_lists_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_notes_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group"/>
       <!-- <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 unofficial="yes" name="ode_api">
-      <unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_scroller_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
-     </component>
-     <component unofficial="yes" name="key_event_utilities_api">
-      <unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_anim_dll_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
-     </component>
-     <component unofficial="yes" name="stylus_activated_popup_api">
-      <unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group"/>
-     </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/group"/>
-     </component>
-     <component unofficial="yes" name="text_scroller_api">
-      <unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group"/>
-     </component>
-     <component unofficial="yes" name="number_grouping_api">
-      <unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_localised_texts_api">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_secondary_display_support_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_ui_settings_api">
-      <unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_shared_document_api">
-      <unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_notifiers_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_input_capabilities_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="find_item_ui_api">
-      <unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_secondary_display_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_configuration_api">
-      <unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_localised_texts_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
-     </component>
-     <component unofficial="yes" name="server_application_services_api">
-      <unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="japanese_reading_api">
-      <unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_notes_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_buttons_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group"/>
-     </component>
-     <component unofficial="yes" name="transition_effect_parameters_api">
-      <unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_indicators_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group"/>
-     </component>
-     <component unofficial="yes" name="global_popup_priority_controller_api">
-      <unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group"/>
-     </component>
-     <component unofficial="yes" name="screensaver_runtime_api">
-      <unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-     </component>
-     <component unofficial="yes" name="list_effects_api">
-      <unit bldFile="mw/classicui/classicui_plat/list_effects_api/group"/>
-     </component>
-     <component unofficial="yes" name="emergency_call_support_api">
-      <unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_service_interface_menu_api">
-      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_animation_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group"/>
-     </component>
-     <component unofficial="yes" name="input_block_api">
-      <unit bldFile="mw/classicui/classicui_plat/input_block_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_lists_api">
-      <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="task_list_api">
-      <unit bldFile="mw/classicui/classicui_plat/task_list_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_ui_framework_definitions_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="uikon_status_api">
-      <unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="application_switching_api">
-      <unit bldFile="mw/classicui/classicui_plat/application_switching_api/group"/>
-     </component>
-     <component unofficial="yes" name="physics_api">
-      <unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
-     </component>
-     <component unofficial="yes" name="memory_card_ui_api">
-      <unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="transition_effect_utilities_api">
-      <unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="item_finder_api">
-      <unit bldFile="mw/classicui/classicui_plat/item_finder_api/group"/>
-     </component>
-     <component unofficial="yes" name="eikon_server_extension_client_api">
-      <unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_dialogs_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
-     </component>
-     <component unofficial="yes" name="fep_document_navigation_api">
-      <unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_editors_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_aiw_criteria_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group"/>
-     </component>
-     <component unofficial="yes" name="screensaver_animation_plugin_definitions_api">
-      <unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_queries_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_plugin_api">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_slide_show_dialog_api">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_status_pane_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_setting_pages_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group"/>
-     </component>
-     <component unofficial="yes" name="skinnable_clock_api">
-      <unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group"/>
-     </component>
-     <component unofficial="yes" name="indicator_plugin_api">
-      <unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_application_api">
-      <unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
-     </component>
-     <component unofficial="yes" name="screensaver_settings_api">
-      <unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_ui_server_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_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="avkon_fonts_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group"/>
-     </component>
-     <component unofficial="yes" name="legacy_ui_framework_headers_api">
-      <unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_initialization_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_grids_api">
-      <unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_service_interface_base_api">
-      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="avkon_settings_api">
-      <unit bldFile="mw/classicui/classicui_plat/avkon_settings_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="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="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="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="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="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="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="animation_api">
-      <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/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/classicui/classicui_pub/hierarchical_lists_api/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/ganes_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/input_block_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/item_finder_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/key_rotator_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/list_effects_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/number_grouping_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/physics_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/popup_form_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/server_application_services_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/signal_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/special_character_table_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/task_list_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/text_scroller_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/touch_pane_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group"/>
+      <unit bldFile="mw/classicui/classicui_plat/volume_popup_api/tsrc/group"/>
      </component>
     </collection>
    </block>
    <block name="svgt" long-name="SVG Tiny" tech_domain="ui" level="generic" levels="util ui">
     <collection name="svgtopt" long-name="SVGT Opt" level="util">
-     <component name="SVG">
+     <component name="svg">
       <!-- <unit bldFile="mw/svgt/svgtopt/svg/svgrecog/group"/> -->
      </component>
      <component name="nvgdecoder" long-name="NVG Decoder"/>
-     <component name="SVGEngineJI" long-name="SVG Engine JI"/>
-     <component name="SVGTPlugin" long-name="SVGT Plugin">
+     <component name="svgengineji" long-name="SVG Engine JI"/>
+     <component name="svgtplugin" long-name="SVGT Plugin">
       <unit bldFile="mw/svgt/svgtopt/svgtplugin/group"/>
      </component>
      <component unofficial="yes" name="svgtopt_build" long-name="SVGT Opt Build">
@@ -6674,13 +4227,8 @@
      <component unofficial="yes" name="svgt_build" long-name="SVG Tiny Build">
       <unit bldFile="mw/svgt/group"/>
      </component>
-    </collection>
-    <collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
-     <component unofficial="yes" name="nvg_api">
-      <unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
-     </component>
-     <component unofficial="yes" name="svgt_api" long-name="SVG Tiny API">
-      <unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
+     <component unofficial="yes" name="svgt_plat" long-name="SVG Tiny Platform Interfaces" class="api">
+      <unit bldFile="mw/svgt/svgt_plat/group"/>
      </component>
     </collection>
    </block>
@@ -6713,35 +4261,16 @@
      <component unofficial="yes" name="inc">
       <!-- <unit bldFile="mw/uiaccelerator/inc/group"/> -->
      </component>
-     <component unofficial="yes" name="uiaccelerator_test" long-name="UI Accelerator Test">
-      <!-- <unit bldFile="mw/uiaccelerator/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="specific">
-     <component unofficial="yes" name="alf_tracing_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
-     </component>
-     <component unofficial="yes" name="uiaccelerator_plat_build" long-name="UI Accelerator Platform API Build">
+     <component unofficial="yes" name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" class="api">
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_editors_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/tsrc/group"/>
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/tsrc/group"/>
       <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/group"/>
      </component>
-     <component unofficial="yes" name="alf_extension_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_extended_visual_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_client_server_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_editors_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_editors_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_core_toolkit_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
-     </component>
-     <component unofficial="yes" name="alf_visual_api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="uiresources" long-name="UI Resources" tech_domain="ui" level="generic" levels="compile plugin framework server generic data">
@@ -6770,22 +4299,22 @@
      </component>
     </collection>
     <collection name="locales" long-name="Locales" level="framework">
-     <component unofficial="yes" name="loce32">
+     <component name="locales_build" long-name="Locales Component">
       <unit bldFile="mw/uiresources/locales/loce32"/>
      </component>
     </collection>
     <collection name="pictographs" long-name="Pictographs" level="data">
-     <component name="AknPictograph" long-name="AKN Picto Graph">
+     <component name="aknpictograph" long-name="AKN Picto Graph">
       <unit bldFile="mw/uiresources/pictographs/aknpictograph/group"/>
       <!-- <unit bldFile="mw/uiresources/pictographs/aknpictograph/tools/aknpictobitmapbuilder/group"/> -->
      </component>
     </collection>
     <collection name="skins" long-name="Skins" level="data">
-     <component name="AknSkinContent" long-name="AKN Skin Content">
+     <component name="aknskincontent" long-name="AKN Skin Content">
       <unit bldFile="mw/uiresources/skins/aknskincontent/group"/>
       <!-- <unit bldFile="mw/uiresources/skins/aknskincontent/srcdata/scalableseries60skin/mifindexdll"/> -->
      </component>
-     <component name="AknSkins" long-name="AKN Skins">
+     <component name="aknskins" long-name="AKN Skins">
       <unit bldFile="mw/uiresources/skins/aknskins/group"/>
      </component>
     </collection>
@@ -6804,16 +4333,16 @@
      </component>
     </collection>
     <collection name="uigraphics" long-name="UI Graphics" level="generic">
-     <component name="Bitmaps2" long-name="Bitmaps 2">
+     <component name="bitmaps2" long-name="Bitmaps 2">
       <unit bldFile="mw/uiresources/uigraphics/bitmaps2/group"/>
      </component>
-     <component name="Icons">
+     <component name="icons">
       <unit bldFile="mw/uiresources/uigraphics/icons/group"/>
      </component>
-     <component name="VariatedBitmaps" long-name="Variated Bitmaps">
+     <component name="variatedbitmaps" long-name="Variated Bitmaps">
       <unit bldFile="mw/uiresources/uigraphics/variatedbitmaps/group"/>
      </component>
-     <component name="AknIcon" long-name="AKN Icon">
+     <component name="aknicon" long-name="AKN Icon">
       <unit bldFile="mw/uiresources/uigraphics/aknicon/group"/>
      </component>
      <component name="palette" long-name="Palette">
@@ -6821,104 +4350,55 @@
      </component>
     </collection>
     <collection name="helpthemes" long-name="Help Themes" level="data">
-     <component name="helpthemes compo">
+     <component name="helpthemes_build">
       <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"/>
+     <component name="aknlayoutcompiler_build" long-name="AKN Layout Compiler Component">
+      <unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
+     </component>
     </collection>
     <collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-     <component name="cdlcompiler compo" long-name="CDL Compiler Component"/>
+     <component name="cdlcompiler_build" long-name="CDL Compiler Component">
+      <unit bldFile="mw/uitools/cdlcompiler/group"/>
+     </component>
     </collection>
     <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-     <component name="cdlcompilertoolkit compo" long-name="CDL Compiler Toolkit Component"/>
+     <component name="cdlcompilertoolkit_build" long-name="CDL Compiler Toolkit Component">
+      <unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
+     </component>
     </collection>
     <collection name="skincompiler" long-name="Skin Compiler" level="compile">
-     <component name="AknSkinDescCompiler" long-name="AKN Skin Desc Compiler">
+     <component name="aknskindesccompiler" long-name="AKN Skin Desc Compiler">
       <unit bldFile="mw/uitools/skincompiler/aknskindesccompiler/group"/>
      </component>
     </collection>
     <collection name="uiresources_info" long-name="UI Resources Info" level="data">
-     <component unofficial="yes" name="uiresources_test" long-name="UI Resources Test">
-      <!-- <unit bldFile="mw/uiresources/tsrc/group"/> -->
+     <component unofficial="yes" name="uiresources_plat" long-name="UI Resources Platform Interfaces" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/cdl_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group"/>
      </component>
      <component unofficial="yes" name="uiresources_build" long-name="UI Resources Build">
       <unit bldFile="mw/uiresources/group"/>
      </component>
-    </collection>
-    <collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
-     <component unofficial="yes" name="skins_image_attributes_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group"/>
-     </component>
-     <component unofficial="yes" name="mifconv_definitions_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="wallpaper_configuration_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="cdl_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group"/>
-     </component>
-     <component unofficial="yes" name="graphic_configuration_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_skins_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group"/>
-     </component>
-     <component unofficial="yes" name="mif_header_cdl_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
-     </component>
-     <component unofficial="yes" name="tfx_server_plugin_ids_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_system_private_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group"/>
-     </component>
-     <component unofficial="yes" name="personalisation_and_skins_settings_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="language_code_definitions_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="private_user_area_code_definitions_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="tfx_effect_setup_plugin_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="extended_fonts_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_data_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="tfx_server_controller_plugin_api">
-      <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
-     </component>
-    </collection>
-    <collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
-     <component unofficial="yes" name="scalable_icons_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
-     </component>
-     <component unofficial="yes" name="graphics_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group"/>
-     </component>
-     <component unofficial="yes" name="skins_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/skins_api/group"/>
-     </component>
-     <component unofficial="yes" name="layout_id_definitions_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="font_definition_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="pictograph_api">
-      <unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group"/>
+     <component unofficial="yes" name="uiresources_pub" long-name="UI Resources Public Interfaces" class="api">
+      <unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/graphics_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/tsrc/group"/>
+      <unit bldFile="mw/uiresources/uiresources_pub/skins_api/tsrc/group"/>
      </component>
     </collection>
    </block>
-   <block name="hapticsservices" long-name="Haptics Services" tech_domain="ui" level="specific" levels="fw api">
+   <block name="hapticsservices" long-name="Haptics Services" tech_domain="ui" level="generic" levels="fw api">
     <collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
      <component name="tactilearearegistry" long-name="Tactile Area Registry">
       <unit bldFile="mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
@@ -6933,14 +4413,12 @@
       <unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
      </component>
     </collection>
-    <collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
-     <component unofficial="yes" name="tactile_feedback_client_api">
-      <unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
-     </component>
-    </collection>
-    <collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
-     <component unofficial="yes" name="tactile_feedback_server_api">
-      <unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+    <collection name="hapticsservices_info" long-name="Haptics Services Info" level="api">
+     <component unofficial="yes" name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" class="api">
+      <unit bldFile="mw/hapticsservices/hapticsservices_pub/group"/>
+     </component>
+     <component unofficial="yes" name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" class="api">
+      <unit bldFile="mw/hapticsservices/hapticsservices_plat/group"/>
      </component>
     </collection>
    </block>
@@ -6961,12 +4439,12 @@
      </component>
     </collection>
     <collection name="backsteppingsrv" long-name="Backstepping Service" level="server">
-     <component name="bsengine.exe=binary">
+     <component name="bsengine">
       <unit bldFile="mw/homescreensrv/backsteppingsrv/group"/>
      </component>
     </collection>
     <collection name="xcfw" long-name="XCFW" level="framework">
-     <component name="XCFW.dll=binary" long-name="XCFW">
+     <component name="xcfw_build" long-name="XCFW">
       <unit bldFile="mw/homescreensrv/xcfw/group"/>
      </component>
     </collection>
@@ -7016,83 +4494,23 @@
       <unit bldFile="mw/homescreensrv/menucontentsrv/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">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
-     </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">
+    <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
+     <component unofficial="yes" name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" class="api">
       <!-- <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>
-     <component unofficial="yes" name="sapi_actionhandler">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
-     </component>
-     <component unofficial="yes" name="ai_utilities_api">
-      <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/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>
-     <component unofficial="yes" name="sapi_homescreenplugin">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group"/>
-     </component>
-     <component unofficial="yes" name="ai_shortcut_command_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_shortcut_command_api/group"/>
-     </component>
-     <component unofficial="yes" name="shortcutplugin_extension_api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/shortcutplugin_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="sapi_contentpublishing">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+      <!-- <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
      </component>
     </collection>
    </block>
    <block name="appinstall" long-name="Application Installation" tech_domain="rt" level="generic" levels="tool framework generic api">
     <collection name="appinstaller" long-name="App Installer" level="generic">
-     <component name="AppMngr2" long-name="App Mngr2">
+     <component name="appmngr2" long-name="App Mngr2">
       <unit bldFile="mw/appinstall/appinstaller/appmngr2/group"/>
      </component>
-     <component name="AppinstUi" long-name="App Installer UI">
+     <component name="appinstui" long-name="App Installer UI">
       <unit bldFile="mw/appinstall/appinstaller/appinstui/group"/>
      </component>
      <component unofficial="yes" name="appinstaller_build" long-name="App Installer Build">
@@ -7111,12 +4529,12 @@
      </component>
     </collection>
     <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-     <component name="iaupdateapi_stub compo">
+     <component name="iaupdateapi_stub_build">
       <unit bldFile="mw/appinstall/iaupdateapi_stub/group"/>
      </component>
     </collection>
     <collection name="iaupdate" long-name="IA Update" level="api">
-     <component name="IAD">
+     <component name="iad">
       <unit bldFile="mw/appinstall/iaupdate/iad/group"/>
      </component>
      <component name="iaupdate_help" long-name="Help">
@@ -7127,48 +4545,18 @@
      </component>
     </collection>
     <collection name="appinstall_info" long-name="Application Installation Info" level="api">
+     <component unofficial="yes" name="appinstall_pub" long-name="Application Installation Public Interfaces" class="api">
+      <unit bldFile="mw/appinstall/appinstall_pub/group"/>
+      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
+      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
+     </component>
      <component unofficial="yes" name="appinstall_test" long-name="Application Installation Test">
       <!-- <unit bldFile="mw/appinstall/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="appinstall_build" long-name="Application Installation Build">
-      <unit bldFile="mw/appinstall/group"/>
-     </component>
-    </collection>
-    <collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
-     <component unofficial="yes" name="iaupdate_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
-     </component>
-     <component unofficial="yes" name="appmngr2runtimeapi">
-      <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+     <component unofficial="yes" name="appinstall_plat" long-name="Application Installation Platform Interfaces" class="api">
       <!-- <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
-     </component>
-     <component unofficial="yes" name="sw_installer_common_ui_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="task_management_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="task_plugin_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_launcher_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_cr_keys">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_ps_keys">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
-     </component>
-     <component unofficial="yes" name="sw_installer_ui_plugin_api">
-      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
-     </component>
-    </collection>
-    <collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
-     <component unofficial="yes" name="startup_list_management_api">
-      <!-- <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
-      <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"/> -->
+      <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
+      <unit bldFile="mw/appinstall/appinstall_plat/group"/>
      </component>
     </collection>
     <collection name="secureswitools">
@@ -7180,7 +4568,7 @@
    </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 name="lifwservicehandler" long-name="Service Handler">
       <unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
      </component>
     </collection>
@@ -7198,41 +4586,17 @@
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/group"/>
      </component>
     </collection>
-    <collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
-     <component unofficial="yes" name="liw_criteria_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_generic_parameter_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_service_handler_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_common_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
+     <component unofficial="yes" name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_pub/group"/>
+     </component>
+     <component unofficial="yes" name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/group"/>
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/tsrc/group"/>
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group"/>
       <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="liw_service_interface_base_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_client_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="liw_provider_utility_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_utility_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
       <!-- <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="liw_service_interface_menu_api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
-     </component>
-    </collection>
-    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
-     <component unofficial="yes" name="serviceapifw_test" long-name="Service API Framework Test">
-      <!-- <unit bldFile="mw/serviceapifw/tsrc/group"/> -->
-     </component>
      <component unofficial="yes" name="serviceapifw_build" long-name="Service API Framework Build">
       <unit bldFile="mw/serviceapifw/group"/>
      </component>
@@ -7242,8 +4606,8 @@
     <collection name="sapi_applicationmanager" long-name="SAPI Application Manager" level="mw1">
      <component name="appmanagerservice" long-name="App Manager Service"/>
      <component unofficial="yes" name="sapi_applicationmanager_build" long-name="SAPI Application Manager Build">
+      <unit bldFile="mw/serviceapi/serviceproviders/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">
@@ -7262,11 +4626,11 @@
     <collection name="sapi_landmarks" long-name="SAPI Landmarks" level="mw2">
      <component name="landmarksservice" long-name="Landmarks Service"/>
      <component unofficial="yes" name="sapi_landmarks_build" long-name="SAPI Landmarks Build">
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
      </component>
     </collection>
     <collection name="sapi_location" long-name="SAPI Location" level="mw2">
@@ -7276,10 +4640,10 @@
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/group"/>
-      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
      </component>
     </collection>
@@ -7302,19 +4666,19 @@
     <collection name="sapi_messaging" long-name="SAPI Messaging" level="mw2">
      <component name="messagingservice" long-name="Messaging Service"/>
      <component unofficial="yes" name="sapi_messaging_build" long-name="SAPI Messaging Build">
-      <!-- <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_asyncsend/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
+      <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_messaging/group"/>
      </component>
     </collection>
@@ -7331,7 +4695,7 @@
      </component>
     </collection>
     <collection name="sapi_serviceregistry" long-name="SAPI Service Registry" level="os">
-     <component name="serviceregistryprovider.dll=binary">
+     <component name="serviceregistryprovider">
       <!-- <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
       <unit bldFile="mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
      </component>
@@ -7408,7 +4772,7 @@
      <component name="pagescaler" long-name="Page Scaler">
       <unit bldFile="mw/web/webengine/pagescaler/group"/>
      </component>
-     <component name="widgetinstaller" long-name="Widget Installer">
+     <component name="webwidgetinstaller" long-name="Widget Installer">
       <unit bldFile="mw/web/webengine/widgetinstaller/group"/>
      </component>
      <component name="widgetregistry" long-name="Widget Registry">
@@ -7496,92 +4860,19 @@
       <unit bldFile="mw/web/codhandler/group"/>
      </component>
     </collection>
-    <collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-     <component unofficial="yes" name="favourites_engine_api">
+    <collection name="web_info" long-name="Web Info" level="specific">
+     <component unofficial="yes" name="web_pub" long-name="Web Public Interfaces" class="api">
+      <!-- <unit bldFile="mw/web/web_pub/browser_control_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/web/web_pub/download_mgr_client_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/web/web_pub/favourites_engine_api/tsrc/group"/> -->
-      <unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="settings_api">
-      <unit bldFile="mw/web/web_pub/settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_control_api">
-      <unit bldFile="mw/web/web_pub/browser_control_api/group"/>
-      <!-- <unit bldFile="mw/web/web_pub/browser_control_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="web_pub_build" long-name="Web Public API Build">
       <unit bldFile="mw/web/web_pub/group"/>
      </component>
-     <component unofficial="yes" name="download_mgr_client_api">
-      <!-- <unit bldFile="mw/web/web_pub/download_mgr_client_api/tsrc/group"/> -->
-      <unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="download_mgr_ui_api">
-      <unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_plugin_api">
-      <unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
-     </component>
-    </collection>
-    <collection name="web_info" long-name="Web Info" level="specific">
      <component unofficial="yes" name="web_build" long-name="Web Build">
       <unit bldFile="mw/web/group"/>
      </component>
-    </collection>
-    <collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-     <component unofficial="yes" name="launcher_api">
-      <unit bldFile="mw/web/web_plat/launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_dialogs_provider_api">
-      <unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
-     </component>
-     <component unofficial="yes" name="connection_manager_api">
-      <unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="xml_parser_api">
-      <unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="cxml_library_api">
-      <unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
-     </component>
-     <component unofficial="yes" name="cod_handler_api">
-      <unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="web_plat_build" long-name="Web Platform API Build">
+     <component unofficial="yes" name="web_plat" long-name="Web Platform Interfaces" class="api">
       <unit bldFile="mw/web/web_plat/group"/>
      </component>
-     <component unofficial="yes" name="feeds_engine_api">
-      <unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="browser_platform_api">
-      <unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
-     </component>
-     <component unofficial="yes" name="webutils_api">
-      <unit bldFile="mw/web/web_plat/webutils_api/group"/>
-     </component>
-     <component unofficial="yes" name="download_mgr_client_api_extn">
-      <unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
-     </component>
-     <component unofficial="yes" name="recent_url_store_api">
-      <unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
-     </component>
-     <component unofficial="yes" name="scheme_handler_plugin_api">
-      <unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="scriptable_plugin_api">
-      <unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="widget_registry_api">
-      <unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
-     </component>
-     <component unofficial="yes" name="rt_gesturehelper_api">
-      <unit bldFile="mw/web/web_plat/rt_gesturehelper_api/group"/>
-     </component>
-     <component unofficial="yes" name="multipart_parser_api">
-      <unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="aiw_browser_provider_api">
-      <unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="websrv" long-name="Web Services" tech_domain="rt" level="generic" levels="plugin framework server generic specific">
@@ -7668,64 +4959,44 @@
       <unit bldFile="mw/websrv/webservices/group"/>
      </component>
     </collection>
-    <collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
-     <component unofficial="yes" name="web_service_description_api">
+    <collection name="websrv_info" long-name="Web Services Info" level="specific">
+     <component unofficial="yes" name="websrv_build" long-name="Web Services Build">
+      <unit bldFile="mw/websrv/group"/>
+     </component>
+     <component unofficial="yes" name="websrv_pub" long-name="Web Services Public Interfaces" class="api">
+      <unit bldFile="mw/websrv/websrv_pub/group"/>
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_extensions_api">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xml_fragment_api">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
-      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
-     </component>
-     <component unofficial="yes" name="web_service_manager_api">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanager/group"/> -->
-     </component>
-     <component unofficial="yes" name="hostlet_connection_api">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
-     </component>
-     <component unofficial="yes" name="web_service_messaging_api">
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclasses/group"/> -->
       <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclassestester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/tsrc/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
-     </component>
-     <component unofficial="yes" name="web_service_connection_api">
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
-      <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
-      <!-- <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
-     </component>
-    </collection>
-    <collection name="websrv_info" long-name="Web Services Info" level="specific">
-     <component unofficial="yes" name="websrv_build" long-name="Web Services Build">
-      <unit bldFile="mw/websrv/group"/>
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/group"/> -->
+      <!-- <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
      </component>
     </collection>
    </block>
@@ -7739,7 +5010,7 @@
      </component>
     </collection>
     <collection name="emulatorlan" long-name="Emulator Lan" level="1">
-     <component name="emulatorlan compo" long-name="Emulator LAN Component">
+     <component name="emulatorlan_build" long-name="Emulator LAN Component">
       <unit bldFile="app/conntools/emulatorlan/group"/>
      </component>
     </collection>
@@ -7769,18 +5040,18 @@
      <component name="gditools" long-name="GDI Tools">
       <unit bldFile="mw/uitools/gfxtools/gditools/group"/>
      </component>
-     <component name="Color">
+     <component name="color">
       <unit bldFile="mw/uitools/gfxtools/color/group"/>
      </component>
     </collection>
     <collection name="reszip" long-name="Reszip" level="encode">
-     <component name="reszip.exe=binary">
+     <component name="reszip_build">
       <unit bldFile="mw/uitools/reszip/group"/>
      </component>
     </collection>
     <collection name="toollibraries" long-name="Tool Libraries" level="tool">
-     <component name="Arabica"/>
-     <component name="XercesC" long-name="Xerces C"/>
+     <component name="arabica"/>
+     <component name="xercesc" long-name="Xerces C"/>
      <component unofficial="yes" name="toollibraries_build" long-name="Tool Libraries Build">
       <!-- <unit bldFile="mw/uitools/toollibraries/group"/> -->
      </component>
@@ -7794,31 +5065,15 @@
      </component>
     </collection>
     <collection name="uitools_info" long-name="UI Tools Info" level="tool">
-     <component unofficial="yes" name="aknlayoutcompiler">
-      <unit bldFile="mw/uitools/aknlayoutcompiler/group"/>
-     </component>
-     <component unofficial="yes" name="cdlcompiler">
-      <unit bldFile="mw/uitools/cdlcompiler/group"/>
+     <component unofficial="yes" name="uitools_plat" long-name="UI Tools Platform Interfaces" class="api">
+      <unit bldFile="mw/uitools/uitools_plat/group"/>
+     </component>
+     <component unofficial="yes" name="uitools_pub" long-name="UI Tools Public Interfaces" class="api">
+      <unit bldFile="mw/uitools/uitools_pub/group"/>
      </component>
      <component unofficial="yes" name="uitools_build" long-name="UI Tools Build">
       <unit bldFile="mw/uitools/group"/>
      </component>
-     <component unofficial="yes" name="cdlcompilertoolkit">
-      <unit bldFile="mw/uitools/cdlcompilertoolkit/group"/>
-     </component>
-    </collection>
-    <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="tool">
-     <component unofficial="yes" name="layout_system_private_api">
-      <unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
-     </component>
-     <component unofficial="yes" name="cdl_api">
-      <unit bldFile="mw/uitools/uitools_plat/cdl_api/group"/>
-     </component>
-    </collection>
-    <collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="tool">
-     <component unofficial="yes" name="third_party_bitmap_palette_api">
-      <unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
-     </component>
     </collection>
    </block>
   </layer>
@@ -7879,22 +5134,22 @@
      </component>
     </collection>
     <collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-     <component name="lmrefapp.exe=binary">
+     <component name="lmrefapp">
       <unit bldFile="app/location/locationlandmarksrefappfors60/group"/>
      </component>
     </collection>
     <collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-     <component name="LmUiRefApp.exe=binary">
+     <component name="lmuirefapp">
       <unit bldFile="app/location/locationlandmarksuirefapp/group"/>
      </component>
     </collection>
     <collection name="locationsatviewrefapp" long-name="Location Sat View Reference App" level="apps">
-     <component name="SatelliteReference.exe=binary">
+     <component name="satellitereference">
       <unit bldFile="app/location/locationsatviewrefapp/group"/>
      </component>
     </collection>
     <collection name="simpsyconfigurator" long-name="SIM PSY Configurator" level="engine">
-     <component name="simpsyui.exe=binary">
+     <component name="simpsyui">
       <unit bldFile="app/location/simpsyconfigurator/group"/>
      </component>
     </collection>
@@ -7904,22 +5159,19 @@
      </component>
     </collection>
     <collection name="location_info" long-name="Location Apps Info" level="apps">
-     <component unofficial="yes" name="landmarks_ui_selector_api">
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
-      <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/group"/>
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="landmarks_ui_addedit_api">
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
-      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
-     </component>
      <component unofficial="yes" name="location_build" long-name="Location Apps Build">
       <unit bldFile="app/location/group"/>
      </component>
      <component unofficial="yes" name="location_test" long-name="Location Apps Test">
       <!-- <unit bldFile="app/location/tsrc/group"/> -->
      </component>
+     <component unofficial="yes" name="loc_pub" class="api">
+      <unit bldFile="app/location/loc_pub/group"/>
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
+     </component>
     </collection>
    </block>
    <block name="mmsharinguis" long-name="Multimedia Sharing UIs" tech_domain="vc" level="services" levels="base plugin">
@@ -8002,26 +5254,18 @@
      <component unofficial="yes" name="cenrepeditor">
       <!-- <unit bldFile="app/mmsharinguis/tsrc/cenrepeditor/group"/> -->
      </component>
+     <component unofficial="yes" name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" class="api">
+      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/group"/>
+      <!-- <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
+     </component>
      <component unofficial="yes" name="mustestapp">
       <!-- <unit bldFile="app/mmsharinguis/tsrc/mustestapp/group"/> -->
      </component>
     </collection>
-    <collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="plugin">
-     <component unofficial="yes" name="multimedia_sharing_resource_api">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
-     </component>
-     <component unofficial="yes" name="multimedia_sharing_manager_api">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
-      <!-- <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="multimedia_sharing_settings_api">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="phone" long-name="Phone Apps" tech_domain="vc" level="apps" span="2" levels="engine plugin ui apps">
     <collection name="phoneapp" long-name="Phone App" level="apps">
-     <component name="Blacklist">
+     <component name="blacklist">
       <unit bldFile="app/phone/phoneapp/blacklist/group"/>
      </component>
      <component name="phoneui" long-name="Phone UI">
@@ -8052,7 +5296,7 @@
      </component>
     </collection>
     <collection name="phoneengine" long-name="Phone Engine" level="engine">
-     <component name="PhoneCntFinder" long-name="Phone Contact Finder">
+     <component name="phonecntfinder" long-name="Phone Contact Finder">
       <unit bldFile="app/phone/phoneengine/phonecntfinder/group"/>
      </component>
      <component name="audiohandling" long-name="Audio Handling">
@@ -8090,23 +5334,23 @@
       <unit bldFile="app/phone/phoneuis/dialer/group"/>
       <!-- <unit bldFile="app/phone/phoneuis/dialer/tsrc/public/basic/group"/> -->
      </component>
-     <component name="BubbleManager" long-name="Bubble Manager">
+     <component name="bubblemanager" long-name="Bubble Manager">
       <unit bldFile="app/phone/phoneuis/bubblemanager/group"/>
      </component>
-     <component name="ConnectUtil" long-name="Connect Util">
+     <component name="connectutil" long-name="Connect Util">
       <unit bldFile="app/phone/phoneuis/connectutil/group"/>
      </component>
-     <component name="SFIUtils" long-name="SFI Utils">
+     <component name="sfiutils" long-name="SFI Utils">
       <unit bldFile="app/phone/phoneuis/sfiutils/group"/>
       <!-- <unit bldFile="app/phone/phoneuis/sfiutils/tsrc/public/basic/group"/> -->
      </component>
-     <component name="Ussd" long-name="USSD">
+     <component name="ussd" long-name="USSD">
       <unit bldFile="app/phone/phoneuis/ussd/group"/>
      </component>
      <component name="vmbx" long-name="Vmbx">
       <unit bldFile="app/phone/phoneuis/vmbx/group"/>
      </component>
-     <component name="TelephonyDeviceMode" long-name="Telephony Device Mode">
+     <component name="telephonydevicemode" long-name="Telephony Device Mode">
       <unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
      </component>
     </collection>
@@ -8119,67 +5363,14 @@
      <component unofficial="yes" name="phone_build" long-name="Phone Apps Build">
       <unit bldFile="app/phone/group"/>
      </component>
-    </collection>
-    <collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="telephony_microphone_mute_status_api">
-      <unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="3d_ringing_tone_enabler_api">
-      <unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_device_mode_api">
-      <unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_video_mailbox_settings_api">
-      <unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_comms_information_api">
-      <unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="dialer_keypad_api">
-      <unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_application_voip_commands_api">
-      <unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_matching_extension_api">
-      <unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="sfi_utility_api">
-      <unit bldFile="app/phone/phone_plat/sfi_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_information_api">
-      <unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_menu_extension_api">
-      <unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_bubble_extension_api">
-      <unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_logging_extension_api">
-      <unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_mediator_api">
-      <unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_telephony_mediator_api">
-      <unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_configuration_api">
-      <unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="phone_application_commands_api">
-      <unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="telephony_remote_party_information_api">
-      <unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+     <component unofficial="yes" name="phone_plat" long-name="Phone Apps Platform Interfaces" class="api">
+      <unit bldFile="app/phone/phone_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="videotelephony" long-name="Video Telephony Apps" tech_domain="vc" level="apps" levels="engine plugin prot ui">
     <collection name="packetvideoengine" long-name="Packetvideo Engine" level="engine">
-     <component name="PacketVideoEngineBinaries" long-name="Packet Video Engine Binaries"/>
+     <component name="packetvideoenginebinaries" long-name="Packet Video Engine Binaries"/>
     </collection>
     <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
      <component name="videoteleng" long-name="Videotel Engine">
@@ -8203,10 +5394,10 @@
      </component>
     </collection>
     <collection name="vtprotocolplugins" long-name="Video Telephony Protocol Plugins" level="plugin">
-     <component name="DisplaySink" long-name="Display Sink">
+     <component name="displaysink" long-name="Display Sink">
       <unit bldFile="app/videotelephony/vtprotocolplugins/displaysink/group"/>
      </component>
-     <component name="VideoSource" long-name="Video Source">
+     <component name="videosource" long-name="Video Source">
       <unit bldFile="app/videotelephony/vtprotocolplugins/videosource/group"/>
      </component>
      <component unofficial="yes" name="vtprotocolplugins_build" long-name="Video Telephony Protocol Plugins Build">
@@ -8214,19 +5405,16 @@
      </component>
     </collection>
     <collection name="vtprotocols" long-name="Video Telephony Protocols" level="prot">
-     <component name="videotelproto.dll=binary"/>
+     <!-- Empty duplicate component videotelproto.dll=binary removed -->
     </collection>
     <collection name="vtprotocolsstub" long-name="Video Telephony Protocols Stub" level="prot">
-     <component name="videotelproto.dll=binary">
+     <component name="videotelproto">
       <unit bldFile="app/videotelephony/vtprotocolsstub/group"/>
      </component>
     </collection>
-    <collection name="videotelephony_plat" long-name="Video Telephony Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="video_telephony_media_configuration_api">
-      <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="video_telephony_control_mediator_api">
-      <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
+    <collection name="videotelephony_info" long-name="Video Telephony Apps Info" level="ui">
+     <component unofficial="yes" name="videotelephony_plat" long-name="Video Telephony Apps Platform Interfaces" class="api">
+      <unit bldFile="app/videotelephony/videotelephony_plat/group"/>
      </component>
     </collection>
    </block>
@@ -8243,7 +5431,7 @@
      </component>
     </collection>
     <collection name="pocui" long-name="PoC Ui" level="ui">
-     <component name="PoCUiIntgr" long-name="PoC UI Intgr">
+     <component name="pocuiintgr" long-name="PoC UI Intgr">
       <unit bldFile="app/poc/pocui/pocuiintgr/group"/>
       <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiaiwplugin/group"/> -->
       <!-- <unit bldFile="app/poc/pocui/pocuiintgr/pocuiecomplugin/group"/> -->
@@ -8260,21 +5448,13 @@
      <component unofficial="yes" name="poc_build" long-name="PoC Build">
       <unit bldFile="app/poc/group"/>
      </component>
+     <component unofficial="yes" name="poc_plat" long-name="PoC Platform Interfaces" class="api">
+      <unit bldFile="app/poc/poc_plat/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>
-     <component unofficial="yes" name="poc_ui_integration_services_api">
-      <unit bldFile="app/poc/poc_plat/poc_ui_integration_services_api/group"/>
-     </component>
-     <component unofficial="yes" name="poc_api" long-name="PoC API">
-      <unit bldFile="app/poc/poc_plat/poc_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="iptelephony" long-name="IP Telephony" tech_domain="vc" level="apps" levels="plugin eng ui">
     <collection name="commsconfig" long-name="Comms Config" level="ui">
@@ -8317,7 +5497,7 @@
      </component>
     </collection>
     <collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="eng">
-     <component name="svp.dll=binary">
+     <component name="svp">
       <unit bldFile="app/iptelephony/sipvoipprovider/group"/>
      </component>
     </collection>
@@ -8381,26 +5561,11 @@
      </component>
     </collection>
     <collection name="iptelephony_info" long-name="IP Telephony Info" level="ui">
-     <component unofficial="yes" name="cch_server_api">
-      <unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
-     </component>
-     <component unofficial="yes" name="cch_client_api">
-      <unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="vcc_api">
-      <unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
-     </component>
      <component unofficial="yes" name="iptelephony_build" long-name="IP Telephony Build">
       <unit bldFile="app/iptelephony/group"/>
      </component>
-     <component unofficial="yes" name="richcallsettingsengine_api">
-      <unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
-     </component>
-     <component unofficial="yes" name="csc_settingsui_api">
-      <unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
-     </component>
-     <component unofficial="yes" name="vccpropertyhandler_api">
-      <unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
+     <component unofficial="yes" name="iptel_plat" class="api">
+      <unit bldFile="app/iptelephony/iptel_plat/group"/>
      </component>
     </collection>
    </block>
@@ -8415,7 +5580,7 @@
      <component name="service" long-name="Service">
       <unit bldFile="app/settingsuis/defaultapplicationsettings/service/group"/>
      </component>
-     <component name="gsplugin" long-name="GS Plugin">
+     <component name="dasgsplugin" long-name="GS Plugin">
       <unit bldFile="app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
      </component>
      <component unofficial="yes" name="defaultapplicationsettings_build" long-name="Default Application Settings Build">
@@ -8428,18 +5593,18 @@
      </component>
     </collection>
     <collection name="settingsuis_info" long-name="Settings UIs Info" level="ui">
+     <component unofficial="yes" name="devmngt_pub" class="api">
+      <unit bldFile="app/settingsuis/devmngt_pub/group"/>
+     </component>
      <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 unofficial="yes" name="services_db_api">
-      <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group"/>
+     <component unofficial="yes" name="devmngt_plat" class="api">
+      <!-- <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/tsrc/dasclientapitest/group"/> -->
+      <unit bldFile="app/settingsuis/devmngt_plat/group"/>
       <!-- <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/tsrc/servicesdbapitest/group"/> -->
      </component>
     </collection>
@@ -8455,7 +5620,7 @@
      <component name="applicationmanagement_server" long-name="Server">
       <unit bldFile="app/devicecontrol/applicationmanagement/server/group"/>
      </component>
-     <component name="RfsPlugin">
+     <component name="rfsplugin">
       <unit bldFile="app/devicecontrol/applicationmanagement/rfsplugin/group"/>
      </component>
      <component name="amadapter2" long-name="AM Adapter2">
@@ -8463,10 +5628,10 @@
      </component>
     </collection>
     <collection name="customization" long-name="Customization" level="2">
-     <component name="DMUtils">
+     <component name="dmutils">
       <unit bldFile="app/devicecontrol/customization/dmutils/bld"/>
      </component>
-     <component name="UISettingsSrv">
+     <component name="uisettingssrv">
       <unit bldFile="app/devicecontrol/customization/uisettingssrv/bld"/>
      </component>
      <component name="isadapter" long-name="IS Adapter">
@@ -8475,19 +5640,19 @@
      <component name="supadapter" long-name="SUPAdapter">
       <unit bldFile="app/devicecontrol/customization/supadapter/bld"/>
      </component>
-     <component name="WallpaperAdapter">
+     <component name="wallpaperadapter">
       <unit bldFile="app/devicecontrol/customization/wallpaperadapter/bld"/>
      </component>
-     <component name="OperatorLogoAdapter">
+     <component name="operatorlogoadapter">
       <unit bldFile="app/devicecontrol/customization/operatorlogoadapter/bld"/>
      </component>
-     <component name="ScreenSaverAdapter">
+     <component name="screensaveradapter">
       <unit bldFile="app/devicecontrol/customization/screensaveradapter/bld"/>
      </component>
-     <component name="ThemesAdapter">
+     <component name="themesadapter">
       <unit bldFile="app/devicecontrol/customization/themesadapter/bld"/>
      </component>
-     <component name="EmbeddedLinkAdapter">
+     <component name="embeddedlinkadapter">
       <unit bldFile="app/devicecontrol/customization/embeddedlinkadapter/bld"/>
      </component>
     </collection>
@@ -8504,8 +5669,8 @@
      <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 unofficial="yes" name="contentctrl_plat" class="api">
+      <unit bldFile="app/contentcontrol/contentctrl_plat/group"/>
      </component>
     </collection>
    </block>
@@ -8535,6 +5700,9 @@
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotastartupextplg/group"/>
       <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/group"/>
      </component>
+     <component unofficial="yes" name="fotaapp">
+      <unit bldFile="mw/remotemgmt/fotaapplication/group"/>
+     </component>
     </collection>
     <collection name="omadm" long-name="OMA Device Management" level="oma">
      <component name="omadmappui" long-name="OMA DM App UI">
@@ -8568,10 +5736,10 @@
      <component unofficial="yes" name="customization_test">
       <!-- <unit bldFile="app/devicecontrol/customization/tsrc/tarmcustomization/group"/> -->
      </component>
-     <component unofficial="yes" name="applicationmanagement">
+     <component unofficial="yes" name="applicationmanagement_build">
       <unit bldFile="app/devicecontrol/applicationmanagement/group"/>
      </component>
-     <component unofficial="yes" name="customization">
+     <component unofficial="yes" name="customization_build">
       <unit bldFile="app/devicecontrol/customization/group"/>
      </component>
      <component unofficial="yes" name="applicationmanagement_test">
@@ -8580,11 +5748,11 @@
     </collection>
    </block>
    <block name="printing" long-name="Printing" tech_domain="de" level="services" levels="app">
-    <collection name="ImagePrint" long-name="ImagePrint" level="app">
+    <collection name="imageprint" long-name="ImagePrint" level="app">
      <component name="clog">
       <unit bldFile="app/printing/imageprint/clog/group"/>
      </component>
-     <component name="ImagePrintEngine">
+     <component name="imageprintengine">
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/btprotocol/group"/> -->
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/dpof/group"/> -->
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/deviceprotocols/pictbridge2/group"/> -->
@@ -8593,7 +5761,7 @@
       <unit bldFile="app/printing/imageprint/imageprintengine/group"/>
       <!-- <unit bldFile="app/printing/imageprint/imageprintengine/imageprintserver/group"/> -->
      </component>
-     <component name="ImagePrintUI">
+     <component name="imageprintui">
       <unit bldFile="app/printing/imageprint/imageprintui/group"/>
      </component>
      <component unofficial="yes" name="imageprint_build">
@@ -8611,7 +5779,7 @@
      <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">
+     <component name="filemanager_build">
       <unit bldFile="app/files/filemanager/group"/>
      </component>
     </collection>
@@ -8626,12 +5794,10 @@
       <unit bldFile="app/files/filesystemuis/group"/>
      </component>
     </collection>
-    <collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="memory_scan_popup_ui_api">
-      <unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
-     </component>
-    </collection>
     <collection name="files_info" long-name="File Manager Apps Info" level="apps">
+     <component unofficial="yes" name="files_plat" long-name="File Manager Apps Platform Interfaces" class="api">
+      <unit bldFile="app/files/files_plat/group"/>
+     </component>
      <component unofficial="yes" name="files_build" long-name="File Manager Apps Build">
       <unit bldFile="app/files/group"/>
      </component>
@@ -8658,13 +5824,13 @@
      </component>
     </collection>
     <collection name="phonebookui" long-name="Phonebook UI" level="ui">
-     <component name="Phonebook">
+     <component name="phonebook">
       <unit bldFile="app/contacts/phonebookui/phonebook/group"/>
      </component>
-     <component name="Speeddial" long-name="Speed Dial">
+     <component name="speeddial" long-name="Speed Dial">
       <unit bldFile="app/contacts/phonebookui/speeddial/group"/>
      </component>
-     <component name="Phonebook2" long-name="Phone Book 2">
+     <component name="phonebook2" long-name="Phone Book 2">
       <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/ccapplication/ccacommlauncherplugin/tsrc/ut_commlaunchercontacthandler/group"/> -->
       <!-- <unit bldFile="app/contacts/phonebookui/phonebook2/ccapplication/ccapp/tsrc/ut_cmscontactfetcher/group"/> -->
       <unit bldFile="app/contacts/phonebookui/phonebook2/group"/>
@@ -8676,13 +5842,13 @@
      </component>
     </collection>
     <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-     <component name="CntFindPlugin" long-name="Cnt Find Plugin">
+     <component name="cntfindplugin" long-name="Cnt Find Plugin">
       <unit bldFile="app/contacts/phonebookengines/cntfindplugin/group"/>
      </component>
-     <component name="CntSortPlugin" long-name="Cnt Sort Plugin">
+     <component name="cntsortplugin" long-name="Cnt Sort Plugin">
       <unit bldFile="app/contacts/phonebookengines/cntsortplugin/group"/>
      </component>
-     <component name="VirtualPhonebook" long-name="Virtual Phonebook">
+     <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"/> -->
@@ -8730,19 +5896,19 @@
      </component>
     </collection>
     <collection name="predictivesearch" long-name="Predictive Search" level="support">
-     <component name="PcsUtils" long-name="PCS Utils">
+     <component name="pcsutils" long-name="PCS Utils">
       <unit bldFile="app/contacts/predictivesearch/pcsutils/group"/>
      </component>
-     <component name="PcsServerClientAPI" long-name="PCS Server Client API">
+     <component name="pcsserverclientapi" long-name="PCS Server Client API">
       <unit bldFile="app/contacts/predictivesearch/pcsserverclientapi/group"/>
      </component>
-     <component name="PcsServer" long-name="PCS Server">
+     <component name="pcsserver" long-name="PCS Server">
       <unit bldFile="app/contacts/predictivesearch/pcsserver/group"/>
      </component>
      <component name="adapters" long-name="Adapters">
       <unit bldFile="app/contacts/predictivesearch/adapters/contacts/group"/>
      </component>
-     <component name="PcsAlgorithm" long-name="PCS Algorithm">
+     <component name="pcsalgorithm" long-name="PCS Algorithm">
       <unit bldFile="app/contacts/predictivesearch/pcsalgorithm/group"/>
      </component>
      <component unofficial="yes" name="predictivesearch_build" long-name="Predictive Search Build">
@@ -8753,186 +5919,29 @@
      <component unofficial="yes" name="contacts_build" long-name="Contacts Apps Build">
       <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>
-     <component unofficial="yes" name="logs_engine_api_extensions">
-      <unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
-     </component>
-     <component unofficial="yes" name="logs_timers_api">
-      <unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_common_ui_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_image_management_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_data_management_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_extension_plugin_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="cca_launch_api">
+     <component unofficial="yes" name="contacts_plat" long-name="Contacts Apps Platform Interfaces" class="api">
       <!-- <unit bldFile="app/contacts/contacts_plat/cca_launch_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_view_definition_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_configuration_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_extension_definition_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_engine_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="predictivesearch_client_api">
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="presence_cache_api">
+      <!-- <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/contactpresence_api/tsrc/group"/> -->
+      <unit bldFile="app/contacts/contacts_plat/group"/>
+      <!-- <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/contacts/contacts_plat/presence_cache_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_policy_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
+      <!-- <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group"/> -->
       <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="contactpresence_api">
-      <!-- <unit bldFile="app/contacts/contacts_plat/contactpresence_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_ui_utilities_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_vcard_api">
-      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/> -->
-      <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="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/virtual_phonebook_sim_services_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="predictivesearch_algorithm_api">
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_icon_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_store_property_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_thumbnails_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_copy_policy_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_xsp_extension_manager_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_commands_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="logs_ui_command_line_api">
-      <unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_store_api">
       <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_engine_extension_api">
-      <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="predictivesearch_adapters_api">
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
-     </component>
-     <component unofficial="yes" name="cms_contactor_api">
-      <unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_ui_extension_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_extension_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_ui_controls_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_store_configuration_management_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_presentation_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_internal_appfw_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_public_constants_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_thin_ui_extension_plugin_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_2_xsp_view_activation_api">
-      <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
-     </component>
-     <component unofficial="yes" name="virtual_phonebook_migration_support_api">
-      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
-     </component>
-     <component unofficial="yes" name="predictivesearch_utils_api">
-      <!-- <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/> -->
-      <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
-     </component>
-    </collection>
-    <collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
-     <component unofficial="yes" name="phonebook_ui_utilities_api">
+      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="contacts_pub" long-name="Contacts Apps Public Interfaces" class="api">
+      <unit bldFile="app/contacts/contacts_pub/group"/>
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/> -->
+      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/> -->
       <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_thumbnail_operation_api">
-      <unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_data_management_api">
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
-     </component>
-     <component unofficial="yes" name="phonebook_data_addedit_ui_api">
-      <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="phonebook_vcard_importexport_api">
-      <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
       <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="speed_dial_utility_control_api">
-      <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
       <!-- <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/> -->
      </component>
-     <component unofficial="yes" name="phonebook_fetch_ui_api">
-      <!-- <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/> -->
-      <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="organizer" long-name="Organizer Application Suite" tech_domain="pr" level="apps" span="2" levels="support services engine ui">
@@ -8986,7 +5995,7 @@
       <unit bldFile="app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
       <unit bldFile="app/organizer/calendarui/regionalplugins/thai/group"/>
      </component>
-     <component name="inc"/>
+     <!-- Empty duplicate component inc removed -->
      <component unofficial="yes" name="calendarui_build" long-name="Calendar UI Build">
       <unit bldFile="app/organizer/calendarui/group"/>
      </component>
@@ -9098,86 +6107,22 @@
       <unit bldFile="app/organizer/searchfw/group"/>
      </component>
     </collection>
-    <collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="ui">
-     <component unofficial="yes" name="notepad_library_api">
-      <unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
+    <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
+     <component unofficial="yes" name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" class="api">
+      <!-- <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
+      <unit bldFile="app/organizer/organizer_pub/group"/>
       <!-- <unit bldFile="app/organizer/organizer_pub/notepad_library_api/tsrc/group"/> -->
      </component>
-     <component unofficial="yes" name="calendar_interim_utils2_api">
-      <!-- <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
-      <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
-     </component>
-    </collection>
-    <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
      <component unofficial="yes" name="organizer_build" long-name="Organizer Application Suite Build">
       <unit bldFile="app/organizer/group"/>
      </component>
-    </collection>
-    <collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="ui">
-     <component unofficial="yes" name="calendar_importer_api">
+     <component unofficial="yes" name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" class="api">
+      <!-- <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
+      <!-- <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/tsrc/group"/> -->
-      <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_ui_secondary_display_api">
-      <unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="alarm_const_api">
-      <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/calendar_exporter_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="meeting_request_utillities_api">
-      <unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
-     </component>
-     <component unofficial="yes" name="common_alarm_editor_api">
-      <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
       <!-- <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="meeting_request_viewer_api">
-      <unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
-     </component>
-     <component unofficial="yes" name="searchfw_launcher_api">
-      <unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="agenda_versit_2_api">
-      <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_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/group"/>
       <!-- <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">
-      <unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="clock_settings_api">
-      <unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_launcher_api">
-      <unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_settings_keys_api">
-      <unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
-     </component>
-     <component unofficial="yes" name="calendar_tones_settings_keys_api">
-      <unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
      </component>
     </collection>
    </block>
@@ -9364,94 +6309,33 @@
      </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"/>
+     <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test">
+      <!-- <unit bldFile="app/messaging/tsrc/group"/> -->
+     </component>
+     <component unofficial="yes" name="msg_plat" class="api">
+      <!-- <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
+      <unit bldFile="app/messaging/msg_plat/group"/>
+      <unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/messaging_editor_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_application_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_codec_client_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_conformance_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/mms_server_settings_api/tsrc/group"/>
+      <!-- <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
+      <unit bldFile="app/messaging/msg_plat/smil_engine_api/tsrc/group"/>
+      <unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/tsrc/group"/>
+     </component>
+     <component unofficial="yes" name="msg_pub" class="api">
+      <unit bldFile="app/messaging/msg_pub/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"/> -->
+      <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/tsrc/group"/>
+      <!-- <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
+      <unit bldFile="app/messaging/msg_pub/plugin_bio_control_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">
-      <!-- <unit bldFile="app/messaging/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="messaging_media_resolver_api">
-      <unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_center_ui_utilities_api">
-      <unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_message_notification_api">
-      <unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_status_api">
-      <unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
-     </component>
-     <component unofficial="yes" name="open_new_message_notification_api">
-      <unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
-     </component>
-     <component unofficial="yes" name="internet_mail_mtm_ui_api">
-      <unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_engine_settings_api">
-      <unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_integration_api">
-      <unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_application_api">
-      <unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
-     </component>
-     <component unofficial="yes" name="plugin_bio_control_api">
-      <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
-      <!-- <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mms_server_settings_api">
-      <unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="send_ui_meeting_request_api">
-      <!-- <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
-      <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
-     </component>
-     <component unofficial="yes" name="mail_ui_constants_api">
-      <unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contact_notes_extended_api">
-      <unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
-     </component>
-     <component unofficial="yes" name="unified_editor_video_conversion_api">
-      <unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_secondary_display_api">
-      <unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_editor_api">
-      <unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
-     </component>
-     <component unofficial="yes" name="smil_player_launch_api">
-      <unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_codec_client_api">
-      <unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
-     </component>
-     <component unofficial="yes" name="smil_engine_api">
-      <unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="smil_transition_api">
-      <unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
-     </component>
-     <component unofficial="yes" name="mms_conformance_api">
-      <unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
-     </component>
-     <component unofficial="yes" name="new_contacts_note_variables_api">
-      <unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_editor_constants_api">
-      <unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="commonemail" long-name="Email Apps" tech_domain="pr" level="apps" levels="service support ui app">
@@ -9574,7 +6458,7 @@
      </component>
     </collection>
     <collection name="emailhelp" long-name="Email Help" level="support">
-     <component name="emailhelp compo">
+     <component name="emailhelp_build">
       <!-- <unit bldFile="app/commonemail/emailhelp/group"/> -->
      </component>
     </collection>
@@ -9582,23 +6466,23 @@
      <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="starter" long-name="Starter"/>
+     <!-- Empty duplicate component starter removed -->
     </collection>
     <collection name="commonemail_help" long-name="Email Help" level="support">
-     <component name="help compo"/>
+     <component name="help"/>
     </collection>
     <collection name="commonemail_info" long-name="Email Apps Info" level="app">
+     <component unofficial="yes" name="email_plat" class="api">
+      <unit bldFile="app/commonemail/email_plat/group"/>
+     </component>
      <component unofficial="yes" name="commonemail_build" long-name="Email Apps Build">
       <unit bldFile="app/commonemail/group"/>
      </component>
-     <component unofficial="yes" name="email_setup_plugin_api">
-      <unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="conversations" long-name="Conversation Apps" tech_domain="pr" level="apps" levels="settings utils ui">
     <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-     <component name="vimpstsettings.dll=binary">
+     <component name="vimpstsettings">
       <unit bldFile="app/conversations/uiservicetabsettings/group"/>
      </component>
     </collection>
@@ -9666,21 +6550,13 @@
      </component>
     </collection>
     <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
+     <component unofficial="yes" name="conversations_plat" long-name="Conversation Apps Platform Interfaces" class="api">
+      <unit bldFile="app/conversations/conversations_plat/group"/>
+     </component>
      <component unofficial="yes" name="conversations_build" long-name="Conversation Apps Build">
       <unit bldFile="app/conversations/group"/>
      </component>
     </collection>
-    <collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="im_cv_launcher_api">
-      <unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
-     </component>
-     <component unofficial="yes" name="conversations_plat_build" long-name="Conversation Apps Platform API Build">
-      <unit bldFile="app/conversations/conversations_plat/group"/>
-     </component>
-     <component unofficial="yes" name="im_connection_api">
-      <unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="im" long-name="Instant Messaging Apps" tech_domain="pr" level="apps" levels="support engine apps">
     <collection name="impsengine" long-name="IMPS Engine" level="engine">
@@ -9699,10 +6575,10 @@
      <component name="imlauncher" long-name="IM Launcher">
       <!-- <unit bldFile="app/im/impsengine/imlauncher/group"/> -->
      </component>
-     <component name="ImpsDataChannel" long-name="Imps Data Channel">
+     <component name="impsdatachannel" long-name="Imps Data Channel">
       <!-- <unit bldFile="app/im/impsengine/impsdatachannel/group"/> -->
      </component>
-     <component name="ImpsIpCirWatcher" long-name="Imps Ip Cir Watcher">
+     <component name="impsipcirwatcher" long-name="Imps Ip Cir Watcher">
       <!-- <unit bldFile="app/im/impsengine/impsipcirwatcher/group"/> -->
      </component>
      <component name="messageencoder" long-name="Message Encoder">
@@ -9719,8 +6595,8 @@
      </component>
      <component unofficial="yes" name="impsengine_test" long-name="IMPS Engine Test">
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertimerprocess/group"/> -->
+      <!-- <unit bldFile="app/im/impsengine/tsrc/public/advance/group"/> -->
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertest/group"/> -->
-      <!-- <unit bldFile="app/im/impsengine/tsrc/public/advance/group"/> -->
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/group"/> -->
       <!-- <unit bldFile="app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertestplugin/group"/> -->
      </component>
@@ -9729,34 +6605,34 @@
      </component>
     </collection>
     <collection name="pecengine" long-name="Presence Engine" level="engine">
-     <component name="CoreUtilsLib2" long-name="Core Utils Lib 2">
+     <component name="coreutilslib2" long-name="Core Utils Lib 2">
       <!-- <unit bldFile="app/im/pecengine/coreutilslib2/group"/> -->
      </component>
-     <component name="StorageManager2" long-name="Storage Manager 2">
+     <component name="storagemanager2" long-name="Storage Manager 2">
       <!-- <unit bldFile="app/im/pecengine/storagemanager2/group"/> -->
      </component>
-     <component name="Parser2">
+     <component name="pecparser2">
       <!-- <unit bldFile="app/im/pecengine/parser2/group"/> -->
      </component>
-     <component name="AttributeLibrary2" long-name="Attribute Library 2">
+     <component name="attributelibrary2" long-name="Attribute Library 2">
       <!-- <unit bldFile="app/im/pecengine/attributelibrary2/group"/> -->
      </component>
-     <component name="ListLibrary2" long-name="List Library 2">
+     <component name="listlibrary2" long-name="List Library 2">
       <!-- <unit bldFile="app/im/pecengine/listlibrary2/group"/> -->
      </component>
-     <component name="TransferAdapter2" long-name="Transfer Adapter 2">
+     <component name="transferadapter2" long-name="Transfer Adapter 2">
       <!-- <unit bldFile="app/im/pecengine/transferadapter2/group"/> -->
      </component>
-     <component name="PresenceServer2" long-name="Presence Server 2">
+     <component name="presenceserver2" long-name="Presence Server 2">
       <!-- <unit bldFile="app/im/pecengine/presenceserver2/group"/> -->
      </component>
-     <component name="PresenceManager2" long-name="Presence Manager 2">
+     <component name="presencemanager2" long-name="Presence Manager 2">
       <!-- <unit bldFile="app/im/pecengine/presencemanager2/group"/> -->
      </component>
-     <component name="JanitorPlugin2" long-name="Janitor Plugin 2">
+     <component name="janitorplugin2" long-name="Janitor Plugin 2">
       <!-- <unit bldFile="app/im/pecengine/janitorplugin2/group"/> -->
      </component>
-     <component name="PluginServer2" long-name="Plugin Server 2">
+     <component name="pluginserver2" long-name="Plugin Server 2">
       <!-- <unit bldFile="app/im/pecengine/pluginserver2/group"/> -->
      </component>
      <component unofficial="yes" name="pecengine_build" long-name="Presence Engine Build">
@@ -9764,7 +6640,7 @@
      </component>
     </collection>
     <collection name="presadap12" long-name="Presence Adap 12" level="support">
-     <component name="Parser2">
+     <component name="presparser2">
       <!-- <unit bldFile="app/im/presadap12/parser2/group"/> -->
      </component>
      <component name="impsplugin" long-name="IMPS Plugin">
@@ -9775,7 +6651,7 @@
      </component>
     </collection>
     <collection name="wvsettings20" long-name="WV Settings 20" level="support">
-     <component name="WVSAPSettingsStore.dll=binary">
+     <component name="wvsapsettingsstore">
       <unit bldFile="app/im/wvsettings20/group"/>
      </component>
     </collection>
@@ -9783,13 +6659,13 @@
      <component name="imindicatorplugin" long-name="IM Indicator Plugin">
       <!-- <unit bldFile="app/im/wvuing/imindicatorplugin/group"/> -->
      </component>
-     <component name="IMPSConnectionUI" long-name="IMPS Connection UI">
+     <component name="impsconnectionui" long-name="IMPS Connection UI">
       <!-- <unit bldFile="app/im/wvuing/impsconnectionui/group"/> -->
      </component>
-     <component name="IMPSServiceSettingsUI" long-name="IMPS Service Settings UI">
+     <component name="impsservicesettingsui" long-name="IMPS Service Settings UI">
       <!-- <unit bldFile="app/im/wvuing/impsservicesettingsui/group"/> -->
      </component>
-     <component name="IMPSAlwaysOnlinePlugin" long-name="IMPS Always Online Plugin">
+     <component name="impsalwaysonlineplugin" long-name="IMPS Always Online Plugin">
       <!-- <unit bldFile="app/im/wvuing/impsalwaysonlineplugin/group"/> -->
      </component>
      <component name="wvvariant" long-name="Wvvariant">
@@ -9810,7 +6686,7 @@
      <component name="wvuieng" long-name="Wvuieng">
       <!-- <unit bldFile="app/im/wvuing/wvuieng/group"/> -->
      </component>
-     <component name="ImUtils" long-name="Im Utils">
+     <component name="imutils" long-name="Im Utils">
       <!-- <unit bldFile="app/im/wvuing/imutils/group"/> -->
      </component>
      <component name="wvuiprocess" long-name="WV UI Process">
@@ -9825,7 +6701,7 @@
      <component name="wvuiave" long-name="Wvuiave">
       <!-- <unit bldFile="app/im/wvuing/wvuiave/group"/> -->
      </component>
-     <component name="ImLauncher" long-name="IM Launcher">
+     <component name="wvimlauncher" long-name="IM Launcher">
       <!-- <unit bldFile="app/im/wvuing/imlauncher/group"/> -->
      </component>
      <component unofficial="yes" name="wvuing_build" long-name="WV UI NG Build">
@@ -9833,32 +6709,20 @@
      </component>
     </collection>
     <collection name="im_info" long-name="Instant Messaging Apps Info" level="apps">
-     <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>
-    </collection>
-    <collection name="im_pub" long-name="Instant Messaging Apps Public Interfaces" level="apps">
-     <component unofficial="yes" name="im_application_launch_api">
+     <component unofficial="yes" name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" class="api">
+      <unit bldFile="app/im/im_plat/group"/>
+      <unit bldFile="app/im/im_plat/wv_sap_settings_api/tsrc"/>
+     </component>
+     <component unofficial="yes" name="im_pub" long-name="Instant Messaging Apps Public Interfaces" class="api">
+      <unit bldFile="app/im/im_pub/group"/>
+      <!-- <unit bldFile="app/im/im_pub/im_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertest/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertestplugin/group"/> -->
       <!-- <unit bldFile="app/im/im_pub/im_application_launch_api/tsrc/imlaunchertimerprocess/group"/> -->
-      <unit bldFile="app/im/im_pub/im_application_launch_api/group"/>
-     </component>
-     <component unofficial="yes" name="im_api" long-name="Instant Messaging Apps API">
-      <!-- <unit bldFile="app/im/im_pub/im_api/tsrc/group"/> -->
-      <unit bldFile="app/im/im_pub/im_api/group"/>
+     </component>
+     <component unofficial="yes" name="im_help" long-name="Instant Messaging Apps Help">
+      <unit bldFile="app/im/help/group"/>
      </component>
     </collection>
    </block>
@@ -9885,13 +6749,13 @@
    </block>
    <block name="dictionary" long-name="Dictionary" tech_domain="pr" level="services" levels="appl">
     <collection name="userdict" long-name="User Dictionary" level="appl">
-     <component unofficial="yes" name="userdict_build" long-name="User Dictionary Build">
+     <component name="userdict_build" long-name="UserDict Client">
       <unit bldFile="app/dictionary/userdict/group"/>
      </component>
     </collection>
-    <collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="appl">
-     <component unofficial="yes" name="menu_suites_macros_api">
-      <unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
+    <collection name="dictionary_info" long-name="Dictionary Info" level="appl">
+     <component unofficial="yes" name="dictionary_plat" long-name="Dictionary Platform Interfaces" class="api">
+      <unit bldFile="app/dictionary/dictionary_plat/group"/>
      </component>
     </collection>
    </block>
@@ -9911,33 +6775,28 @@
      <component unofficial="yes" name="camera_build" long-name="Camera Apps Build">
       <unit bldFile="app/camera/group"/>
      </component>
-    </collection>
-    <collection name="camera_plat" long-name="Camera Apps Platform Interfaces" level="1">
-     <component unofficial="yes" name="camcorder_ui_constants_api">
-      <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/group"/>
+     <component unofficial="yes" name="camera_plat" long-name="Camera Apps Platform Interfaces" class="api">
+      <!-- <unit bldFile="app/camera/camera_plat/active_palette_2_api/tsrc/group"/> -->
       <!-- <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="active_palette_2_api">
-      <unit bldFile="app/camera/camera_plat/active_palette_2_api/group"/>
-      <!-- <unit bldFile="app/camera/camera_plat/active_palette_2_api/tsrc/group"/> -->
+      <unit bldFile="app/camera/camera_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="imgeditor" long-name="Image Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
     <collection name="imageeditor" long-name="Image Editor" level="ui">
-     <component name="PB">
+     <component name="pb">
       <unit bldFile="app/imgeditor/imageeditor/pb/group"/>
      </component>
-     <component name="IEPB">
+     <component name="iepb">
       <unit bldFile="app/imgeditor/imageeditor/iepb/group"/>
      </component>
-     <component name="ImageEditorUI" long-name="Image Editor UI">
+     <component name="imageeditorui" long-name="Image Editor UI">
       <unit bldFile="app/imgeditor/imageeditor/imageeditorui/group"/>
      </component>
-     <component name="ImageEditorManager" long-name="Image Editor Manager">
+     <component name="imageeditormanager" long-name="Image Editor Manager">
       <unit bldFile="app/imgeditor/imageeditor/imageeditormanager/group"/>
      </component>
-     <component name="imageeditorApp" long-name="Image Editor App">
+     <component name="imageeditorapp" long-name="Image Editor App">
       <unit bldFile="app/imgeditor/imageeditor/imageeditorapp/group"/>
      </component>
      <component name="imageeditor_plugins" long-name="Plugins">
@@ -9959,7 +6818,7 @@
       <unit bldFile="app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
       <unit bldFile="app/imgeditor/imageeditor/plugins/textplugin/group"/>
      </component>
-     <component name="EditorProvider" long-name="Editor Provider">
+     <component name="editorprovider" long-name="Editor Provider">
       <unit bldFile="app/imgeditor/imageeditor/editorprovider/group"/>
      </component>
      <component unofficial="yes" name="imageeditor_build" long-name="Image Editor Build">
@@ -9989,19 +6848,19 @@
       <unit bldFile="app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
       <unit bldFile="app/imgeditor/imageeditorengine/filters/filtertext/group"/>
      </component>
-     <component name="ImageEditorUtils" long-name="Image Editor Utils">
+     <component name="imageeditorutils" long-name="Image Editor Utils">
       <unit bldFile="app/imgeditor/imageeditorengine/imageeditorutils/group"/>
      </component>
-     <component name="SystemParameters" long-name="System Parameters">
+     <component name="systemparameters" long-name="System Parameters">
       <unit bldFile="app/imgeditor/imageeditorengine/systemparameters/group"/>
      </component>
-     <component name="EngineWrapper" long-name="Engine Wrapper">
+     <component name="enginewrapper" long-name="Engine Wrapper">
       <unit bldFile="app/imgeditor/imageeditorengine/enginewrapper/group"/>
      </component>
-     <component name="JpegRotator" long-name="Jpeg Rotator">
+     <component name="jpegrotator" long-name="Jpeg Rotator">
       <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegrotator/group"/> -->
      </component>
-     <component name="JpegScaler" long-name="Jpeg Scaler">
+     <component name="jpegscaler" long-name="Jpeg Scaler">
       <!-- <unit bldFile="app/imgeditor/imageeditorengine/jpegscaler/group"/> -->
      </component>
      <component unofficial="yes" name="imageeditorengine_build" long-name="Image Editor Engine Build">
@@ -10009,49 +6868,35 @@
      </component>
     </collection>
     <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
+     <component unofficial="yes" name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" class="api">
+      <unit bldFile="app/imgeditor/imgeditor_plat/group"/>
+     </component>
      <component unofficial="yes" name="imgeditor_build" long-name="Image Editor Apps Build">
       <unit bldFile="app/imgeditor/group"/>
      </component>
     </collection>
-    <collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="image_processing_engine_api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_definitions_api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_debug_utilities_api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_utilities_api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
-     </component>
-     <component unofficial="yes" name="image_editor_system_parameters_api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="videoeditor" long-name="Video Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
     <collection name="videditor" long-name="Video Editor" level="ui">
-     <component name="VideoEditorCommon" long-name="Video Editor Common">
+     <component name="videoeditorcommon" long-name="Video Editor Common">
       <unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
      </component>
-     <component name="VideoEditorUiComponents" long-name="Video Editor UI Components">
+     <component name="videoeditoruicomponents" long-name="Video Editor UI Components">
       <unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
      </component>
-     <component name="SimpleVideoEditor" long-name="Simple Video Editor">
+     <component name="simplevideoeditor" long-name="Simple Video Editor">
       <unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
      </component>
-     <component name="SimpleCutVideo" long-name="Simple Cut Video">
+     <component name="simplecutvideo" long-name="Simple Cut Video">
       <unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
      </component>
-     <component name="VideoProvider" long-name="Video Provider">
+     <component name="videoprovider" long-name="Video Provider">
       <unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
      </component>
-     <component name="ManualVideoEditor" long-name="Manual Video Editor">
+     <component name="manualvideoeditor" long-name="Manual Video Editor">
       <unit bldFile="app/videoeditor/videditor/manualvideoeditor/group"/>
      </component>
-     <component name="TrimForMms" long-name="Trim For MMS">
+     <component name="trimformms" long-name="Trim For MMS">
       <!-- <unit bldFile="app/videoeditor/videditor/trimformms/group"/> -->
      </component>
      <component unofficial="yes" name="videditor_build" long-name="Video Editor Build">
@@ -10068,7 +6913,7 @@
      <component name="h263decoder" long-name="H263 Decoder">
       <unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
      </component>
-     <component name="mp3aacManipLib" long-name="Mp3aac Manip Lib">
+     <component name="mp3aacmaniplib" long-name="Mp3aac Manip Lib">
       <unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
      </component>
      <component name="vedtranscoder" long-name="Ved Transcoder">
@@ -10082,15 +6927,13 @@
      </component>
     </collection>
     <collection name="videoeditor_info" long-name="Video Editor Apps Info" level="ui">
+     <component unofficial="yes" name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" class="api">
+      <unit bldFile="app/videoeditor/videoeditor_plat/group"/>
+     </component>
      <component unofficial="yes" name="videoeditor_build" long-name="Video Editor Apps Build">
       <unit bldFile="app/videoeditor/group"/>
      </component>
     </collection>
-    <collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-     <component unofficial="yes" name="video_editor_engine_api">
-      <unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="gallery" long-name="Gallery Apps" tech_domain="ma" level="apps" levels="app">
     <collection name="mediagallery" long-name="Media Gallery" level="app">
@@ -10102,38 +6945,24 @@
      <component unofficial="yes" name="gallery_build" long-name="Gallery Apps Build">
       <unit bldFile="app/gallery/group"/>
      </component>
-    </collection>
-    <collection name="gallery_plat" long-name="Gallery Apps Platform Interfaces" level="app">
-     <component unofficial="yes" name="album_manager_api">
-      <unit bldFile="app/gallery/gallery_plat/album_manager_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_gallery_file_notification">
-      <unit bldFile="app/gallery/gallery_plat/media_gallery_file_notification/group"/>
-     </component>
-     <component unofficial="yes" name="media_gallery_main_view_extension_api">
-      <unit bldFile="app/gallery/gallery_plat/media_gallery_main_view_extension_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_gallery_api">
-      <unit bldFile="app/gallery/gallery_plat/media_gallery_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_file_api">
-      <unit bldFile="app/gallery/gallery_plat/media_file_api/group"/>
+     <component unofficial="yes" name="gallery_plat" long-name="Gallery Apps Platform Interfaces" class="api">
+      <unit bldFile="app/gallery/gallery_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="videoplayer" long-name="Video Player Apps" tech_domain="ma" level="apps" levels="support apps">
     <collection name="lwplayer" long-name="LW Player" level="apps">
-     <component name="LWPlayer.exe=binary" long-name="LW Player">
+     <component name="lwplayer_build" long-name="LW Player">
       <unit bldFile="app/videoplayer/lwplayer/group"/>
      </component>
     </collection>
     <collection name="mediaplayer" long-name="Media Player" level="apps">
-     <component unofficial="yes" name="mediaplayer_build" long-name="Media Player Build">
+     <component name="mediaplayer_build">
       <unit bldFile="app/videoplayer/mediaplayer/group"/>
      </component>
     </collection>
     <collection name="mediasettings" long-name="Media Settings" level="support">
-     <component unofficial="yes" name="mediasettings_build" long-name="Media Settings Build">
+     <component name="mediasettings_build">
       <unit bldFile="app/videoplayer/mediasettings/group"/>
      </component>
     </collection>
@@ -10141,6 +6970,11 @@
      <component unofficial="yes" name="videoplayer_help" long-name="Video Player Apps Help">
       <unit bldFile="app/videoplayer/help/group"/>
      </component>
+     <component unofficial="yes" name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" class="api">
+      <unit bldFile="app/videoplayer/videoplayer_plat/group"/>
+      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_engine_api/tsrc/group"/>
+      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_file_details_dialog_api/tsrc/group"/>
+     </component>
      <component unofficial="yes" name="videoplayer_test" long-name="Video Player Apps Test">
       <!-- <unit bldFile="app/videoplayer/tsrc/group"/> -->
      </component>
@@ -10148,14 +6982,6 @@
       <unit bldFile="app/videoplayer/group"/>
      </component>
     </collection>
-    <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="media_player_engine_api">
-      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_engine_api/group"/>
-     </component>
-     <component unofficial="yes" name="media_player_file_details_dialog_api">
-      <unit bldFile="app/videoplayer/videoplayer_plat/media_player_file_details_dialog_api/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">
@@ -10172,11 +6998,11 @@
      <component name="photosgallery_commonui" long-name="Common UI">
       <unit bldFile="app/photos/photosgallery/commonui/group"/>
      </component>
-     <component name="collectionframework" long-name="Collection Framework">
+     <component name="photoscollectionfw" 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">
+     <component name="photosviewfw" 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"/> -->
@@ -10196,7 +7022,7 @@
      <component name="controllers" long-name="Controllers">
       <unit bldFile="app/photos/photosgallery/controllers/group"/>
      </component>
-     <component name="gallery" long-name="Gallery">
+     <component name="photogallery" long-name="Gallery">
       <unit bldFile="app/photos/photosgallery/gallery/group"/>
      </component>
      <component name="slideshow" long-name="Slideshow">
@@ -10213,7 +7039,7 @@
      <!--<component name="memoryplugin" long-name="Memory Plugin">
        <unit bldFile="app/photos/photosgallery/memoryplugin/group"/>
      </component>-->
-     <component unofficial="yes" name="icons">
+     <component unofficial="yes" name="photosicons">
       <unit bldFile="app/photos/photosgallery/icons"/>
      </component>
      <component unofficial="yes" name="photosgallery_build" long-name="Photos Gallery Build">
@@ -10221,39 +7047,21 @@
      </component>
     </collection>
     <collection name="photos_info" long-name="Photos Info" level="app">
+     <component unofficial="yes" name="photos_plat" long-name="Photos Platform Interfaces" class="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_collectioninfo/group"/> -->
+      <!-- <unit bldFile="app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group"/> -->
+      <unit bldFile="app/photos/photos_plat/group"/>
+     </component>
      <component unofficial="yes" name="photos_build" long-name="Photos Build">
       <unit bldFile="app/photos/group"/>
      </component>
     </collection>
-    <collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
-     <component unofficial="yes" name="gallery_utilities_api">
-      <unit bldFile="app/photos/photos_plat/gallery_utilities_api/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>
-     <component unofficial="yes" name="slideshow_ui_constants_api">
-      <unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
-     </component>
-     <component unofficial="yes" name="views_metadatadialog_api">
-      <unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="videocenter" long-name="Video Center" tech_domain="ma" level="apps" levels="eng ui app">
     <collection name="mpxmyvideoscollection" long-name="MPX My Videos Collection" level="app">
-     <component name="mpx_common_api" long-name="MPX Common_Api">
+     <component name="mpx_common_api" long-name="MPX Common_Api" class="api">
       <unit bldFile="app/videocenter/mpxmyvideoscollection/mpx_common_api/group"/>
-      <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"/>
@@ -10397,14 +7205,9 @@
      <component unofficial="yes" name="videocenter_build" long-name="Video Center Build">
       <unit bldFile="app/videocenter/group"/>
      </component>
-    </collection>
-    <collection name="videocenter_plat" long-name="Video Center Platform Interfaces" level="app">
-     <component unofficial="yes" name="videocenter_plat_build" long-name="Video Center Platform API Build">
+     <component unofficial="yes" name="videocenter_plat" long-name="Video Center Platform Interfaces" class="api">
       <unit bldFile="app/videocenter/videocenter_plat/group"/>
      </component>
-     <component unofficial="yes" name="videocenter_player_api">
-      <unit bldFile="app/videocenter/videocenter_plat/videocenter_player_api/group"/>
-     </component>
     </collection>
    </block>
    <block name="musicplayer" long-name="Music Player Apps" tech_domain="ma" level="apps" levels="plugins support apps">
@@ -10470,39 +7273,15 @@
       <unit bldFile="app/musicplayer/mpxplugins/group"/>
      </component>
     </collection>
-    <collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="apps">
-     <component unofficial="yes" name="mpx_music_store_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_shop_ui_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_media_key_handler_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_wap_adapter_cenrep_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
-     </component>
-     <component unofficial="yes" name="music_visualization_plugin_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/music_visualization_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="audio_application_features_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_remote_control_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_app_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_music_player_commonui_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
-     </component>
-     <component unofficial="yes" name="music_content_publisher_plugin_api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
-     </component>
-    </collection>
     <collection name="musicplayer_info" long-name="Music Player Apps Info" level="apps">
+     <component unofficial="yes" name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/tsrc/group"/>
+      <unit bldFile="app/musicplayer/musicplayer_plat/music_visualization_plugin_api/tsrc/group"/>
+     </component>
      <component unofficial="yes" name="musicplayer_test" long-name="Music Player Apps Test">
       <!-- <unit bldFile="app/musicplayer/tsrc/group"/> -->
      </component>
@@ -10525,9 +7304,7 @@
      <component name="fmradiomcpplugin" long-name="FM Radio MCP Plugin">
       <unit bldFile="app/radio/fmradio/fmradiomcpplugin/group"/>
      </component>
-     <component name="FMRadio">
-      <unit bldFile="app/radio/fmradio/fmradio/group"/>
-     </component>
+     
      <component name="fmradio_help" long-name="Help">
       <unit bldFile="app/radio/fmradio/help/group"/>
      </component>
@@ -10538,13 +7315,13 @@
    </block>
    <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">
+     <component name="voicerecordergsplugin" long-name="GS Plugin">
       <!-- <unit bldFile="app/voicerec/voicerecorder/gsplugin/group"/> -->
      </component>
      <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">
+     <component name="voicerecorder_build">
       <unit bldFile="app/voicerec/voicerecorder/group"/>
      </component>
     </collection>
@@ -10555,13 +7332,9 @@
      <component unofficial="yes" name="voicerec_test" long-name="Voice Recorder Apps Test">
       <!-- <unit bldFile="app/voicerec/tsrc/group"/> -->
      </component>
-    </collection>
-    <collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces" level="1">
-     <component unofficial="yes" name="new_file_service_api">
-      <unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
-     </component>
-     <component unofficial="yes" name="voicerecorder_public_constants_api">
-      <unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
+     <component unofficial="yes" name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces" class="api">
+      <unit bldFile="app/voicerec/voicerec_plat/group"/>
+      <unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/tsrc/group"/>
      </component>
     </collection>
    </block>
@@ -10570,7 +7343,7 @@
      <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">
+     <component name="imageviewer_build">
       <unit bldFile="app/imgvieweruis/imageviewer/group"/>
      </component>
     </collection>
@@ -10589,9 +7362,7 @@
       <unit bldFile="app/screensaver/scrsaver/screensaveraiwplugin/group"/>
      </component>
     </collection>
-    <collection name="screensaver.exe=binary" long-name="Screen Saver" level="plugin">
-     <component name="screensaver.exe=binary compo"/>
-    </collection>
+    
     <collection name="screensaver_info" long-name="Screen Saver Apps Info" level="plugin">
      <component unofficial="yes" name="screensaver_build" long-name="Screen Saver Apps Build">
       <unit bldFile="app/screensaver/group"/>
@@ -10639,16 +7410,14 @@
      <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 unofficial="yes" name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" class="api">
+      <unit bldFile="app/homescreen/homescreen_plat/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">
-     <component name="SvgtViewerPlugin" long-name="SVGT Viewer Plugin">
+     <component name="svgtviewerplugin" long-name="SVGT Viewer Plugin">
       <unit bldFile="app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
      </component>
      <component unofficial="yes" name="svgtviewer_build" long-name="SVGT Viewer Build">
@@ -10659,22 +7428,14 @@
      <component unofficial="yes" name="graphicsuis_build" long-name="Graphics UIs Build">
       <unit bldFile="app/graphicsuis/group"/>
      </component>
-    </collection>
-    <collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
-     <component unofficial="yes" name="svg_application_observer_utility_api">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="svgt_file_view_details_dialog_api">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
-     </component>
-     <component unofficial="yes" name="svgt_viewer_ui_api">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
+     <component unofficial="yes" name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" class="api">
+      <unit bldFile="app/graphicsuis/graphicsuis_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="profile" long-name="Profile" tech_domain="ui" level="apps" levels="app">
     <collection name="profilesapplication" long-name="Profiles Application" level="app">
-     <component name="Profiles" long-name="Profiles">
+     <component name="profiles" long-name="Profiles">
       <unit bldFile="app/profile/profilesapplication/profiles/group"/>
       <!-- <unit bldFile="app/profile/profilesapplication/profiles/gsprofilesplugin/group"/> -->
       <!-- <unit bldFile="app/profile/profilesapplication/profiles/profileaiwprovider/group"/> -->
@@ -10686,14 +7447,9 @@
       <!-- <unit bldFile="app/profile/profilesapplication/tsrc/public/basic/group"/> -->
      </component>
     </collection>
-    <collection name="profile_plat" long-name="Profile Platform Interfaces" level="app">
-     <component unofficial="yes" name="profiles_settings_view_api">
-      <unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
-     </component>
-    </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 unofficial="yes" name="profile_plat" long-name="Profile Platform Interfaces" class="api">
+      <unit bldFile="app/profile/profile_plat/group"/>
      </component>
      <component unofficial="yes" name="profile_help" long-name="Profile Help">
       <unit bldFile="app/profile/help/group"/>
@@ -10794,89 +7550,6 @@
       <unit bldFile="app/speechsrv/srsf/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"/>
-     </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">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
-     </component>
-     <component unofficial="yes" name="srsf_secondarydisplay_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
-     </component>
-     <component unofficial="yes" name="tts_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="voice_ui_accessory_button_handling_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
-     </component>
-     <component unofficial="yes" name="vocman_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="asrs_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="vcommand_settings_cenrep_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
-     </component>
-     <component unofficial="yes" name="adaptation_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_srs_custom_commands_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="speech_synthesis_clientserver_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
-     </component>
-     <component unofficial="yes" name="grcompiler_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="recognition_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="voice_ui_plugin_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
-     </component>
-     <component unofficial="yes" name="vas_contact_handler_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
-     </component>
-     <component unofficial="yes" name="vas_vcommand_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_devtts_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
-     </component>
-     <component unofficial="yes" name="srsf_cenrep_settings_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_srs_utility_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
-     </component>
-     <component unofficial="yes" name="ttp_hw_device_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_mmf_tts_custom_commands_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
-     </component>
-     <component unofficial="yes" name="nss_si_speech_recognition_data_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
-     </component>
-     <component unofficial="yes" name="nlp_hw_device">
-      <unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
-     </component>
-     <component unofficial="yes" name="vas_api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
-     </component>
-     <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"/> -->
@@ -10884,21 +7557,25 @@
      <component unofficial="yes" name="speechsrv_build" long-name="Speech Recognition UIs Build">
       <unit bldFile="app/speechsrv/group"/>
      </component>
+     <component unofficial="yes" name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/group"/>
+      <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/tsrc/group"/>
+     </component>
     </collection>
    </block>
    <block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">
     <collection name="dtdinstaller" long-name="DTD Installer" level="install">
-     <component name="dtdinstaller compo">
+     <component name="dtdinstaller_build">
       <unit bldFile="tools/homescreentools/dtdinstaller/group"/>
      </component>
     </collection>
     <collection name="themeinstaller" long-name="Theme Installer" level="install">
-     <component name="themeinstaller compo">
+     <component name="themeinstaller_build">
       <unit bldFile="tools/homescreentools/themeinstaller/group"/>
      </component>
     </collection>
     <collection name="themetool" long-name="Theme Tool" level="tool">
-     <component name="themetool compo">
+     <component name="themetool_build">
       <unit bldFile="tools/homescreentools/themetool/group"/>
      </component>
     </collection>
@@ -10942,7 +7619,7 @@
      <component name="pushmtm_help" long-name="Help">
       <unit bldFile="app/webuis/pushmtm/help/group"/>
      </component>
-     <component name="Plugins">
+     <component name="plugins">
       <unit bldFile="app/webuis/pushmtm/plugins/group"/>
      </component>
      <component unofficial="yes" name="pushmtm_build" long-name="Push MTM Build">
@@ -10970,21 +7647,21 @@
      <component name="iferecognizers" long-name="Ife Recognizers"/>
     </collection>
     <collection name="javalegacy" long-name="Java Legacy" level="util">
-     <component name="JcfCommon" long-name="Jcf Common"/>
+     <component name="jcfcommon" long-name="Jcf Common"/>
      <component name="j2me" long-name="J2ME"/>
     </collection>
     <collection name="javamanager" long-name="Java Manager" level="framework">
      <component name="javabackup" long-name="Java Backup"/>
-     <component name="javaregistry" long-name="Java Registry"/>
+     <!-- Empty duplicate component javaregistry removed -->
      <component name="javadrmmanager" long-name="Java DRM Manager"/>
      <component name="javasettings" long-name="Java Settings"/>
     </collection>
     <collection name="javaruntime" long-name="Java Runtime" level="rt">
-     <component name="javaruntime_common" long-name="Common"/>
+     <!-- Empty duplicate component common removed -->
      <component name="temp_j2me_root" long-name="Temp J2me Root"/>
      <component name="jvm" long-name="JVM"/>
      <component name="eventserver" long-name="Event Server"/>
-     <component name="javaruntime_utils" long-name="Utilities"/>
+     <!-- Empty duplicate component utils removed -->
      <component name="midp2ams" long-name="Midp2ams"/>
      <component name="redirserver" long-name="Redirect Server"/>
     </collection>
@@ -10992,15 +7669,13 @@
      <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"/>
+     <!-- Empty duplicate component common removed -->
      <component name="integrityserver" long-name="Integrity Server"/>
-     <!--component manually moved to javautils collection-->
-     <!--<component name="javadrmutils" long-name="Java DRM Utils"/>-->
+     <!-- Empty duplicate component javadrmutils removed -->
      <component name="javarecognizer" long-name="Java Recognizer"/>
      <component name="iconconverter" long-name="Icon Converter"/>
      <component name="adt" long-name="ADT"/>
-     <!--component manually moved to javautils collection-->
-     <!--<component name="javaenvinfo" long-name="Java Environment Info"/>-->
+     <!-- Empty duplicate component javaenvinfo removed -->
     </collection>
     <collection name="java_stubs" long-name="Java Stubs" level="util">
      <!--component manually moved to javautils collection-->
@@ -11025,22 +7700,14 @@
      <component unofficial="yes" name="java_build" long-name="Java Build">
       <unit bldFile="app/java/group"/>
      </component>
-    </collection>
-    <collection name="java_plat" long-name="Java Platform Interfaces" level="rt">
-     <component unofficial="yes" name="java_registry_api">
-      <unit bldFile="app/java/java_plat/java_registry_api/group"/>
-     </component>
-     <component unofficial="yes" name="java_superd_parser_api">
-      <unit bldFile="app/java/java_plat/java_superd_parser_api/group"/>
-     </component>
-     <component unofficial="yes" name="java_env_info_api">
-      <unit bldFile="app/java/java_plat/java_env_info_api/group"/>
+     <component unofficial="yes" name="java_plat" long-name="Java Platform Interfaces" class="api">
+      <unit bldFile="app/java/java_plat/group"/>
      </component>
     </collection>
    </block>
    <block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
     <collection name="creator" long-name="Creator" level="app">
-     <component name="creator.exe=binary">
+     <component name="creator_build">
       <unit bldFile="tools/rndtools/creator/group"/>
      </component>
     </collection>
@@ -11051,22 +7718,22 @@
      <component name="fileopclient" long-name="File Op Client">
       <unit bldFile="tools/rndtools/filebrowser/fileopclient/group"/>
      </component>
-     <component unofficial="yes" name="filebrowser_build" long-name="File Browser Build">
+     <component name="filebrowser_build">
       <unit bldFile="tools/rndtools/filebrowser/group"/>
      </component>
     </collection>
     <collection name="launcher" long-name="Launcher" level="specific">
-     <component name="Launcher.exe=binary">
+     <component name="launcher_build">
       <unit bldFile="tools/rndtools/launcher/group"/>
      </component>
     </collection>
     <collection name="screengrabber" long-name="Screen Grabber" level="specific">
-     <component name="ScreenGrabber.exe=binary">
+     <component name="screengrabber_build">
       <unit bldFile="tools/rndtools/screengrabber/group"/>
      </component>
     </collection>
     <collection name="stifui" long-name="STIF UI" level="generic">
-     <component name="stifui" long-name="STIF UI">
+     <component name="stifui_stifui" long-name="STIF UI">
       <unit bldFile="tools/rndtools/stifui/stifui/group"/>
      </component>
      <component name="uitestserverstarter" long-name="UI Test Server Starter">
@@ -11077,25 +7744,25 @@
      </component>
     </collection>
     <collection name="loadgen" long-name="Load Generator" level="app">
-     <component name="LoadGen.exe=binary">
+     <component name="loadgen_build">
       <unit bldFile="tools/rndtools/loadgen/group"/>
      </component>
     </collection>
     <collection name="perfmon" long-name="Performance Monitor" level="app">
-     <component name="PerfMon.exe=binary">
+     <component name="perfmon_build">
       <unit bldFile="tools/rndtools/perfmon/group"/>
      </component>
     </collection>
     <collection name="htiui" long-name="HTI UI" level="generic">
-     <component name="HtiCommPlugins" long-name="HTI Comm Plugins"/>
-     <component name="HtiServicePlugins" long-name="HTI Service Plugins"/>
-     <component name="HtiDeviceReboot" long-name="HTI DeviceR eboot">
+     <!-- Empty duplicate component HtiCommPlugins removed -->
+     <!-- Empty duplicate component HtiServicePlugins removed -->
+     <component name="htidevicereboot" long-name="HTI DeviceR eboot">
       <unit bldFile="tools/rndtools/htiui/htidevicereboot/group"/>
      </component>
-     <component name="HtiStartupWait" long-name="HTI Startup Wait">
+     <component name="htistartupwait" long-name="HTI Startup Wait">
       <unit bldFile="tools/rndtools/htiui/htistartupwait/group"/>
      </component>
-     <component name="HtiAdmin" long-name="HTI Admin">
+     <component name="htiadmin" long-name="HTI Admin">
       <unit bldFile="tools/rndtools/htiui/htiadmin/group"/>
      </component>
      <component unofficial="yes" name="htiui_build" long-name="HTI UI Build">
@@ -11103,14 +7770,14 @@
      </component>
     </collection>
     <collection name="memspyui" long-name="Memspy UI" level="generic">
-     <component name="memspyui.exe=binary">
+     <component name="memspyui_build">
       <unit bldFile="tools/rndtools/memspyui/group"/>
      </component>
     </collection>
    </block>
    <block name="helps" long-name="Help Apps" tech_domain="ui" level="apps" span="2" levels="eng tools unused  ui">
     <collection name="csxhelp" long-name="Context Sensitive Extended Help" level="ui">
-     <component name="AiwHelpProvider" long-name="Aiw Help Provider">
+     <component name="aiwhelpprovider" long-name="Aiw Help Provider">
       <!-- <unit bldFile="app/helps/csxhelp/aiwhelpprovider/group"/> -->
      </component>
      <component unofficial="yes" name="csxhelp_build" long-name="Context Sensitive Extended Help Build">