MCL/sftools/fbf/projects/platforms: comparison symbian3/single/sysdefs/full_system_model

equal deleted inserted replaced

-:731411a3cd2a
+:b73548d05e72
 </layer>
 <layer id="os" name="OS" levels="hw services">
 <package id="kernelhwsrv" level="hw" tech-domain="hb" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
 <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
 <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
+<unit bldFile="/os/kernelhwsrv/brdbootldr/ubootldr" mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
 </component>
 </collection>
 <collection id="bsptemplate" name="Board Support Package Template" level="hw-if">
 <component id="asspandvariant" name="Template ASSP and Variant" introduced="6.0" purpose="development">
 <unit bldFile="/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
 <unit mrp="/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="ossrv" level="services" tech-domain="hb" name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+<collection id="ossrv_pub" name="Generic OS Services Public Interfaces" level="utilities">
+<component id="boost_apis" name="Boost APIs" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/boost_apis/group"/>
+</component>
+<component id="cpp_wrappers" name="Cpp wrappers" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+</component>
+<component id="character_type_apis" name="Character Type APIs" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/character_type_apis/group"/>
+</component>
+<component id="compiler_specific_runtime_support" name="Compiler Specific Runtime Support" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
+</component>
+<component id="ossrv_configuration_api" name="Generic OS Services Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/configuration/group"/>
+</component>
+<component id="crypto_authentication_codes_and_hash_functions_api" name="Crypto Authentication Codes and Hash Functions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+</component>
+<component id="crypto_auxillary_functions_api" name="Crypto Auxillary Functions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
+</component>
+<component id="crypto_certificates_api" name="Crypto Certificates API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
+</component>
+<component id="crypto_inputoutput_and_data_encoding_api" name="Crypto Input/Output and Data Encoding API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+</component>
+<component id="crypto_public_key_cryptography_and_key_agreement_api" name="Crypto Public Key Cryptography and Key Agreement API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+</component>
+<component id="crypto_symmetric_ciphers_api" name="Crypto Symmetric Ciphers API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+</component>
+<component id="crypto_utility_functions_api" name="Crypto Utility Functions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
+</component>
+<component id="cryptogaphy_related_api" name="Cryptogaphy Related API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
+</component>
+<component id="ossrv_debug_api" name="Generic OS Services Debug API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/debug/group"/>
+</component>
+<component id="ossrv_exceptions_api" name="Generic OS Services Exceptions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/exceptions/group"/>
+</component>
+<component id="gboxed" name="GBoxed API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/gboxed/group"/>
+</component>
+<component id="glib_arrays" name="Glib Arrays API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_arrays/group"/>
+</component>
+<component id="glib_asynchronous_queues" name="Glib Asynchronous Queues API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
+</component>
+<component id="glib_atomic_operations" name="Glib Atomic Operations API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
+</component>
+<component id="glib_automatic_string_completion" name="Glib Automatic String Completion API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
+</component>
+<component id="glib_balanced_binary_trees" name="Glib Balanced Binary Trees API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
+</component>
+<component id="glib_basic_types" name="Glib Basic Types API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_basic_types/group"/>
+</component>
+<component id="glib_caches" name="Glib Caches API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_caches/group"/>
+</component>
+<component id="glib_character_set_conversion" name="Glib Character Set Conversion API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
+</component>
+<component id="glib_closures" name="Glib Closures API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_closures/group"/>
+</component>
+<component id="glib_commandline_option_parser" name="Glib Command Line Option Parser API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
+</component>
+<component id="glib_datasets" name="Glib Datasets API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_datasets/group"/>
+</component>
+<component id="glib_date_and_time_functions" name="Glib Date and Time Functions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
+</component>
+<component id="glib_doubleended_queues" name="Glib Double-ended Queues API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
+</component>
+<component id="glib_doublylinked_lists" name="Glib Doubly-Linked Lists API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
+</component>
+<component id="glib_dynamic_loading_of_modules" name="Glib Dynamic Loading of Modules API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
+</component>
+<component id="glib_enums_and_flags" name="Glib Enums and Flags API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
+</component>
+<component id="glib_error_reporting" name="Glib Error Reporting API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_error_reporting/group"/>
+</component>
+<component id="glib_file_utilities" name="Glib File Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_file_utilities/group"/>
+</component>
+<component id="glib_generic_values" name="Glib Generic Values API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_generic_values/group"/>
+</component>
+<component id="glib_globstyle_pattern_matching" name="Glib Glob-Style Pattern Matching API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
+</component>
+<component id="glib_hash_tables" name="Glib Hash Tables API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_hash_tables/group"/>
+</component>
+<component id="glib_hook_functions" name="Glib Hook Functions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_hook_functions/group"/>
+</component>
+<component id="glib_internationalization" name="Glib  Internationalization API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_internationalization/group"/>
+</component>
+<component id="glib_io_channels" name="Glib I/O Channels API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_io_channels/group"/>
+</component>
+<component id="glib_keyvalue_file_parser" name="Glib Key-Value File Parser API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
+</component>
+<component id="glib_lexical_scanner" name="Glib Lexical Scanner API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
+</component>
+<component id="glib_main_event_loop" name="Glib Main Event Loop API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
+</component>
+<component id="glib_memory_allocation" name="Glib Memory Allocation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
+</component>
+<component id="glib_memory_slices" name="Glib Memory Slices API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_memory_slices/group"/>
+</component>
+<component id="glib_message_logging" name="Glib Message Logging API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_message_logging/group"/>
+</component>
+<component id="glib_miscellaneous_utility_functions" name="Glib Miscellaneous Utility Functions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
+</component>
+<component id="glib_nary_trees" name="Glib N-ary Trees API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_nary_trees/group"/>
+</component>
+<component id="glib_parameters_and_values" name="Glib Parameters and Values API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
+</component>
+<component id="glib_quarks" name="Glib Quarks API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_quarks/group"/>
+</component>
+<component id="glib_random_numbers" name="Glib Random Numbers API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_random_numbers/group"/>
+</component>
+<component id="glib_relations_and_tuples" name="Glib Relations and Tuples API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
+</component>
+<component id="glib_shellrelated_utilities" name="Glib Shell-related Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
+</component>
+<component id="glib_signals" name="Glib Signals API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_signals/group"/>
+</component>
+<component id="glib_simple_xml_subset_parser" name="Glib Simple XML Subset Parser API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
+</component>
+<component id="glib_singlylinked_lists" name="Glib Singly-Linked Lists API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
+</component>
+<component id="glib_spawning_processes" name="Glib Spawning Processes API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
+</component>
+<component id="glib_standard_macros" name="Glib Standard Macros API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_standard_macros/group"/>
+</component>
+<component id="glib_string_utility_functions" name="Glib String Utility Functions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
+</component>
+<component id="glib_strings" name="Glib Strings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_strings/group"/>
+</component>
+<component id="glib_thread_pools" name="Glib Thread Pools API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_thread_pools/group"/>
+</component>
+<component id="glib_threads" name="Glib Threads API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_threads/group"/>
+</component>
+<component id="glib_timers" name="Glib Timers API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_timers/group"/>
+</component>
+<component id="glib_unicode_manipulation" name="Glib Unicode Manipulation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
+</component>
+<component id="glib_value_arrays" name="Glib Value Arrays API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_value_arrays/group"/>
+</component>
+<component id="glib_varargs_value_collection" name="Glib Varargs Value Collection API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
+</component>
+<component id="gobject" name="GObject API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/gobject/group"/>
+</component>
+<component id="gparamspec" name="GParamSpec API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/gparamspec/group"/>
+</component>
+<component id="gtype" name="GType API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/gtype/group"/>
+</component>
+<component id="gtypemodule" name="GTypeModule API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/gtypemodule/group"/>
+</component>
+<component id="gtypeplugin" name="GTypePlugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/gtypeplugin/group"/>
+</component>
+<component id="io_stream_api" name="I/O stream API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/io_stream_api/group"/>
+</component>
+<component id="localization_function_api" name="Localization Function API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/localization_function_api/group"/>
+</component>
+<component id="math_operations_api" name="Math Operations API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/math_operations_api/group"/>
+</component>
+<component id="ossrv_memory_api" name="Generic OS Services Memory API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/memory/group"/>
+</component>
+<component id="no_namespace_headers" name="No Namespace Headers" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+</component>
+<component id="openc_headers" name="OpenC headers" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/openc_headers/group"/>
+</component>
+<component id="openc_wrappers" name="OpenC wrappers" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/openc_wrappers/group"/>
+</component>
+<component id="ssl_general_api" name="SSL General API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/ssl_general_api/group"/>
+</component>
+<component id="ssl_protocol_methods_api" name="SSL Protocol Methods API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
+</component>
+<component id="standard_compressiondecompression_api" name="Standard Compression/Decompression API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+</component>
+<component id="stl" name="STL API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/stl/group"/>
+</component>
+<component id="thread_api" name="Thread API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/thread_api/group"/>
+</component>
+<component id="type_attributes" name="Type Attributes API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/type_attributes/group"/>
+</component>
+<component id="typeinfo" name="Type Info API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/typeinfo/group"/>
+</component>
+<component id="utility_apis" name="Utility APIs" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/utility_apis/group"/>
+</component>
+<component id="wide_character_classapis" name="Wide character class/apis" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+</component>
+<component id="dbus_api" name="Dbus API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/dbus/group"/>
+</component>
+<component id="dbus-glib" name="Dbus-glib API" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_pub/dbus-glib/group"/>
+</component>
+</collection>
+<collection id="ossrv_plat" name="Generic OS Services Platform Interfaces" level="utilities">
+<component id="libutils_apis" name="Utility Library APIs" class="api" filter="s60">
+<unit bldFile="/os/ossrv/ossrv_plat/libutils/group"/>
+</component>
+</collection>
 <collection id="stdlibs" name="Standard Libraries" level="translation">
 <component id="libz" filter="s60" name="Z Compression Library">
 <unit bldFile="/os/ossrv/stdlibs/libz/group"/>
 </component>
 <component id="libcrypt" filter="s60" name="Crypt Library">
 <unit bldFile="/os/ossrv/ssl/libssl/group"/>
 </component>
 </collection>
 <collection id="glib" name="GLib" level="utilities">
 <component id="glibbackend" filter="s60" name="GLib Backend">
-<unit bldFile="/os/ossrv/glib/glibbackend/group"/>
+<unit bldFile="/os/ossrv/glib/build/symbian/glibbackend/group"/>
+<!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
 </component>
 <component id="libglib" filter="s60" name="GLib Library">
-<unit bldFile="/os/ossrv/glib/libglib/group"/>
+<unit bldFile="/os/ossrv/glib/build/symbian/glib/group"/>
+<!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
 </component>
 <component id="libgthread" filter="s60" name="Libg Thread">
-<unit bldFile="/os/ossrv/glib/libgthread/group"/>
+<unit bldFile="/os/ossrv/glib/build/symbian/gthread/group"/>
+<!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
 </component>
 <component id="libgmodule" filter="s60" name="Libg Module">
-<unit bldFile="/os/ossrv/glib/libgmodule/group"/>
+<unit bldFile="/os/ossrv/glib/build/symbian/gmodule/group"/>
+<!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
 </component>
 <component id="libgobject" filter="s60" name="Libg Object">
-<unit bldFile="/os/ossrv/glib/libgobject/group"/>
+<unit bldFile="/os/ossrv/glib/build/symbian/gobject/group"/>
+<!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
 </component>
 </collection>
 <collection id="stdcpp" name="C++ Standard Library" level="translation">
 <!-- collection is really a component. Needs to be moved down a directory -->
 <component id="stdcpp_build" filter="s60" name="Stdcpp">
 <unit bldFile="/os/ossrv/genericopenlibs/openenvcore/group" mrp="/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
 </component>
 <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
 <unit bldFile="/os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="/os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
 </component>
+<component id="liboil" name="Liboil" introduced="^4" purpose="optional">
+<unit bldFile="/os/ossrv/genericopenlibs/liboil/group" mrp="/os/ossrv/genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
+</component>
 </collection>
 <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
 <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">
 <unit version="3" bldFile="/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom3.mrp"/>
 </component>
 </component>
 </collection>
 <collection id="ossrv_info" name="Generic OS Services Info" level="utilities">
 <component id="ossrv_build" filter="s60" name="Generic OS Services Build">
 <!-- exports should be moved to individual components -->
-<unit bldFile="/os/ossrv/rom"/>
+<unit bldFile="/os/ossrv/group"/>
-</component>
-<component id="ossrv_plat" filter="s60" name="Generic OS Services Platform Interfaces" class="api">
-<unit bldFile="/os/ossrv/ossrv_plat/libutils/group"/>
-</component>
-<component id="ossrv_pub" filter="s60" name="Generic OS Services Public Interfaces" class="api">
-<unit bldFile="/os/ossrv/ossrv_pub/group"/>
 </component>
 <component id="ossrv_metadata" name="Generic OS Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
 </component>
 </collection>
 <unit mrp="/os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="devicesrv" level="services" tech-domain="hb" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
+<component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
+</component>
+<component id="common_platform_security_definitions_api" name="Common Platform Security Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+</component>
+<component id="feature_discovery_api" name="Feature Discovery API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+</component>
+<component id="platform_environment_api" name="Platform Environment API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+</component>
+<component id="sensor_channel_api" name="Sensor Channel API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+</component>
+<component id="sensor_definitions_api" name="Sensor Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+</component>
+<component id="version_info_api" name="Version Info API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_pub/version_info_api/group"/>
+</component>
+<component id="accessory_monitoring_api" name="Accessory Monitoring API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+</component>
+<component id="haptics_api" name="Haptics API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_pub/haptics_api/group"/>
+</component>
+<component id="sensor_data_compensator_api" name="Sensor Data Compensator API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+</component>
+<component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60">
+<unit bldFile="/os/devicesrv/devicesrv_pub/platform_path_definitions_api/inc/platform_paths.hrh"/>
+</component>
+</collection>
+<collection id="devicesrv_plat" name="Device Services Platform Interfaces" level="app-if">
+<component id="configuration_file_parser_api" name="Configuration File Parser API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+</component>
+<component id="dos_extension_plugin_api" name="DOS Extension Plug-In API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+</component>
+<component id="mediator_command_initiator_api" name="Mediator Command Initiator API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+</component>
+<component id="syslangutil_api" name="SysLangUtil API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+</component>
+<component id="wakeup_alarm_api" name="Wakeup Alarm API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+</component>
+<component id="disk_and_memory_level_keys_api" name="Disk and Memory Level Keys API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+</component>
+<component id="mediator_plugin_api" name="Mediator Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+</component>
+<component id="headset_status_api" name="Headset Status API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+</component>
+<component id="system_startup_extension_plugin_api" name="System Startup Extension Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+</component>
+<component id="sensor_plugin_api" name="Sensor Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+</component>
+<component id="accessory_api" name="Accessory API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_api/group"/>
+</component>
+<component id="display_language_definition_api" name="Display Language Definition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+</component>
+<component id="mediator_command_responder_api" name="Mediator Command Responder API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+</component>
+<component id="accessory_policy_definitions_api" name="Accessory Policy Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+</component>
+<component id="hw_settings_api" name="Hardware Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+</component>
+<component id="mediator_domain_definitions_api" name="Mediator Domain Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+</component>
+<component id="sensor_extension_api" name="Sensor Extension API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+</component>
+<component id="accessory_plugin_api" name="Accessory Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+</component>
+<component id="sae_api" name="SAE API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/sae_api/group"/>
+</component>
+<component id="accessory_control_api" name="Accessory Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+</component>
+<component id="mediator_static_registration_api" name="Mediator Static Registration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+</component>
+<component id="accessory_key_event_handling_api" name="Accessory Key Event Handling API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+</component>
+<component id="mediator_notification_api" name="Mediator Notification API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+</component>
+<component id="accessory_policy_utility_api" name="Accessory Policy Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+</component>
+<component id="common_dsy_plugin_api" name="Common DSY Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+</component>
+<component id="remote_control_extension_api" name="Remote Control Extension API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+</component>
+<component id="sensor_channel_filter_api" name="Sensor Channel Filter API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+</component>
+<component id="dos_extension_api" name="DOS Extension API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+</component>
+<component id="accessory_audio_control_api" name="Accessory Audio Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+</component>
+<component id="mediator_event_consumer_api" name="Mediator Event Consumer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+</component>
+<component id="shared_data_api" name="Shared Data API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+</component>
+<component id="accessory_settings_api" name="Accessory Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+</component>
+<component id="accessory_bluetooth_control_api" name="Accessory Bluetooth Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+</component>
+<component id="extended_version_info_api" name="Extended Version Info API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+</component>
+<component id="mediator_event_provider_api" name="Mediator Event Provider API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+</component>
+<component id="tv_out_config_api" name="TV Out Config API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+</component>
+<component id="tspclientmapper_api" name="TSP Client Mapper API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+</component>
+<component id="powersave_api" name="Power Save API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_api/group"/>
+</component>
+<component id="powersave_definitions_api" name="Power Save Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+</component>
+<component id="powersave_plugin_api" name="Power Save Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+</component>
+<component id="extended_version_info_plugin_api" name="Extended Version Info Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+</component>
+<component id="haptics_plugin_api" name="Haptics Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+</component>
+<component id="haptics_effect_data_getter_plugin_api" name="Haptics Effect Data Getter Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+</component>
+<component id="haptics_packetizer_plugin_api" name="Haptics Packetizer Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+</component>
+<component id="tiltcompensation_api" name="Tilt Compensation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+</component>
+<component id="disk_notification_handler_api" name="Disk Notification Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+</component>
+<component id="accessory_policy_usb_audio_api" name="Accessory Policy USB Audio API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+</component>
+<component id="accessory_policy_hdmi_audio_api" name="Accessory Policy HDMI Audio API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+</component>
+<component id="sensor_data_compensator_plugin_api" name="Sensor Data Compensator Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+</component>
+<component id="ddc_access_api" name="DDC Access API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+</component>
+<component id="tv_out_behaviour_api" name="TV Out Behaviour API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+</component>
+</collection>
 <collection id="accessoryservices" name="Accessory Services" level="framework">
 <component id="accessorymonitor" filter="s60" name="Accessory Monitor">
 <unit bldFile="/os/devicesrv/accessoryservices/accessorymonitor/group"/>
 </component>
 <component id="accessoryremotecontrol" filter="s60" name="Accessory Remote Control">
 <component id="hwrmhaitest" name="HWRM HAI Tests" introduced="^2" purpose="development" filter="test">
 <unit mrp="/os/devicesrv/devicesrvapitest/hwrmhaitest/group/hwrmhaitest.mrp" bldFile="/os/devicesrv/devicesrvapitest/hwrmhaitest/group"/>
 </component>
 </collection>
 <collection id="devicesrv_info" name="Device Services Info" level="app-if">
-<component id="devicesrv_plat" filter="s60" name="Device Services Platform Interfaces" class="api">
-<unit bldFile="/os/devicesrv/devicesrv_plat/group"/>
-</component>
-<component id="devicesrv_pub" filter="s60" name="Device Services Public Interfaces" class="api">
-<unit bldFile="/os/devicesrv/devicesrv_pub/group"/>
-<unit bldFile="/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group" filter="bldmefirst"/>
-<!-- separate to another component? -->
-</component>
 <component id="devicesrv_metadata" name="Device Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <unit bldFile="/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
 </component>
 <component id="cafrecogniserconfig" name="CAF Recogniser Config" introduced="9.1" purpose="mandatory">
 <unit bldFile="/os/security/contentmgmt/cafrecogniserconfig" mrp="/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
 </component>
-<component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development" filter="test">
+<component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development">
-<!-- remove test filter once cafstreamingsupport is available -->
 <unit bldFile="/os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="/os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+</component>
+<component id="cafstreamingsupport" name="CAF Streaming Support" introduced="^3" purpose="optional">
+<unit bldFile="/os/security/contentmgmt/cafstreamingsupport/group" mrp="/os/security/contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp"/>
 </component>
 </collection>
 <collection id="crypto" name="Crypto Libraries" level="libraries">
 <component id="weakcryptospi" name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
 <unit bldFile="/os/security/crypto/weakcryptospi/group" mrp="/os/security/crypto/weakcryptospi/group/security_cryptospi_weak.mrp"/>
 <component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
 <unit bldFile="/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
 </component>
 <component id="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
 <unit mrp="/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+</component>
+<component id="rootcertificates" filter="sf_build" name="Root Certificates" introduced="7.0s" purpose="optional">
+<!-- not in S60 codebase -->
+<unit bldFile="/os/security/cryptoservices/rootcertificates/group" mrp="/os/security/cryptoservices/rootcertificates/group/rootcerts.mrp"/>
 </component>
 <component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
 <unit bldFile="/os/security/cryptoservices/asnpkcs/group" mrp="/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
 </component>
 </collection>
 <unit bldFile="/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
 </component>
 </collection>
 </package>
 <package id="wlan" level="services" tech-domain="dc" name="WLAN" levels="hw low mid high tools test">
+<collection id="wlan_plat" name="WLAN Platform Interfaces" level="test">
+<component id="wlan_dbif_api" name="WLAN DBIF API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_dbif_api/group"/>
+</component>
+<component id="wlan_hal_api" name="WLAN HAL API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_hal_api/group"/>
+</component>
+<component id="wlan_management_api" name="WLAN Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_management_api/group"/>
+</component>
+<component id="wlan_device_settings_api" name="WLAN Device Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+</component>
+<component id="wlan_control_api" name="WLAN Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_control_api/group"/>
+</component>
+<component id="wlan_hw_initialization_data_api" name="WLAN Hardware Initialization Data API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+</component>
+<component id="wlan_power_save_plugin_api" name="WLAN Power Save Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+</component>
+<component id="wlan_info_api" name="WLAN Info API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_info_api/group"/>
+</component>
+<component id="wlan_agent_hotspot_plugin_api" name="WLAN Agent Hotspot Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+</component>
+<component id="wlan_osa_api" name="WLAN OSA API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_osa_api/group"/>
+</component>
+<component id="wlan_spia_api" name="WLAN SPIA API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_spia_api/group"/>
+</component>
+<component id="wlan_hpa_api" name="WLAN HPA API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_hpa_api/group"/>
+</component>
+<component id="wlan_eapol_plugin_api" name="WLAN EAPOL Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+</component>
+<component id="wlan_generic_plugin_api" name="WLAN Generic Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+</component>
+<component id="wlan_aws_plugin_api" name="WLAN AWS Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+</component>
+</collection>
+<collection id="wlan_pub" name="WLAN Public Interfaces" level="test">
+<component id="wlan_sdk_info_api" name="WLAN SDK Info API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+</component>
+</collection>
 <collection id="wlan_bearer" name="WLAN Bearer" level="hw">
 <component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
 <unit bldFile="/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
 </component>
 <component id="wlanagent" filter="s60" name="WLAN Agent">
 <component id="wlanhaitest" name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
 <unit mrp="/os/wlan/wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="/os/wlan/wlanapitest/wlanhaitest/group"/>
 </component>
 </collection>
 <collection id="wlan_info" name="WLAN Info" level="test">
-<component id="wlan_pub" filter="s60" name="WLAN Public Interfaces" class="api">
-<unit bldFile="/os/wlan/wlan_pub/group"/>
-</component>
-<component id="wlan_plat" filter="s60" name="WLAN Platform Interfaces" class="api">
-<unit bldFile="/os/wlan/wlan_plat/group"/>
-</component>
 <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
 <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
 <unit bldFile="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
 </component>
 </collection>
-<collection id="fax" name="Fax" level="server">
-<component id="faxclientandserver" name="Fax Client and Server" purpose="optional">
-<unit bldFile="/os/cellularsrv/fax/faxclientandserver/Group" mrp="/os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-</component>
-</collection>
 <collection id="smsprotocols" name="SMS Protocols" level="framework">
 <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
 <unit bldFile="/os/cellularsrv/smsprotocols/smsstack/group" mrp="/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
 </component>
 </collection>
 <unit mrp="/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="/os/cellularsrv/cellularsrvapitest/telephonydevsoundhaitest/group"/>
 </component>
 </collection>
 </package>
 <package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
+<component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+</component>
+<component id="bluetooth_power_management_api" name="Bluetooth Power Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/bt/bt_plat/bluetooth_power_management_api/group"/>
+</component>
+<component id="at_command_handler_plugin_api" name="AT Command Handler Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/bt/bt_plat/at_command_handler_plugin_api/group"/>
+</component>
+</collection>
 <collection id="bluetooth" name="Bluetooth Core" level="framework">
 <component id="btstack" name="Bluetooth Stack" introduced="6.0" purpose="optional">
 <unit bldFile="/os/bt/bluetooth/btstack" mrp="/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
 </component>
 <component id="btcomm" name="Bluetooth CSY" introduced="6.0" purpose="optional" class="plugin">
 <component id="atext_build" name="AT Extension Build" introduced="^3" purpose="optional" filter="s60">
 <unit bldFile="/os/bt/atext/group"/>
 </component>
 </collection>
 <collection id="bt_info" name="Bluetooth Info" level="app-if">
-<component id="bt_plat" filter="s60" class="api">
-<unit bldFile="/os/bt/bt_plat/group"/>
-</component>
 <component id="bt_metadata" name="Bluetooth Metadata" class="config" introduced="^3" purpose="development" target="desktop">
 <unit mrp="/os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="usb" level="services" tech-domain="de" name="USB" levels="adaptation hw-if plugin framework server app-if">
+<collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
+<component id="usb_audio_stream_plugin_api" name="USB Audio Stream Plugin API" class="api" filter="s60">
+<unit bldFile="/os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
+</component>
+</collection>
 <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
 <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
 </collection>
 <collection id="usbmgmt" name="USB Management" level="server">
 <component id="usbmgr" name="USB Manager" purpose="optional">
 <component id="usbclassandmgrdocs" name="USB Class and Manager Documentation" purpose="development" class="doc">
 <unit mrp="/os/usb/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
 </component>
 </collection>
 <collection id="usb_info" name="USB Info" level="app-if">
-<component id="usb_plat" filter="s60" name="USB Platform Interfaces" class="api">
-<unit bldFile="/os/usb/usb_plat/group"/>
-</component>
 <component id="usb_metadata" name="USB Metadata" class="config" introduced="^3" purpose="development" target="desktop">
 <unit mrp="/os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="mm" level="services" tech-domain="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+<collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
+<component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_pub/audio_effects_api/group"/>
+</component>
+<component id="audio_effects_presets_api" name="Audio Effects Presets API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_pub/audio_effects_presets_api/group"/>
+</component>
+<component id="drm_audio_player_api" name="DRM Audio Player API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_pub/drm_audio_player_api/group"/>
+</component>
+<component id="multimedia_extension_interfaces_api" name="Multimedia Extension Interfaces API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
+</component>
+</collection>
+<collection id="mm_plat" name="Multimedia Platform Interfaces" level="app-if">
+<component id="aac_decoder_config_api" name="AAC Decoder Config API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_api/group"/>
+</component>
+<component id="aac_decoder_config_msg_hdlr_api" name="AAC Decoder Config Msg Hdlr API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
+</component>
+<component id="aac_decoder_config_proxy_api" name="AAC Decoder Config Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
+</component>
+<component id="added_devsound_control_api" name="Added DevSound Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_api/group"/>
+</component>
+<component id="added_devsound_control_msg_hdlr_api" name="Added DevSound Control Msg Hdlr API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+</component>
+<component id="added_devsound_control_proxy_api" name="Added DevSound Control Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
+</component>
+<component id="audio_effects_msg_hdlr_api" name="Audio Effects Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
+</component>
+<component id="audio_effects_proxy_api" name="Audio Effects Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/audio_effects_proxy_api/group"/>
+</component>
+<component id="audio_policy_header_api" name="Audio Policy Header API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/audio_policy_header_api/group"/>
+</component>
+<component id="audio_routing_api" name="Audio Routing API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/audio_routing_api/group"/>
+</component>
+<component id="audio_routing_msg_hdlr_api" name="Audio Routing Msg Hdlr API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
+</component>
+<component id="audio_routing_proxy_api" name="Audio Routing Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/audio_routing_proxy_api/group"/>
+</component>
+<component id="custom_interface_builder_api" name="Custom Interface Builder API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/custom_interface_builder_api/group"/>
+</component>
+<component id="custom_interface_message_handler_factory_api" name="Custom Interface Message Handler Factory API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
+</component>
+<component id="custom_interface_proxy_factory_api" name="Custom Interface Proxy Factory API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
+</component>
+<component id="custom_interface_utility_api" name="Custom Interface Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/custom_interface_utility_api/group"/>
+</component>
+<component id="devsound_adaptation_api" name="DevSound Adaptation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/devsound_adaptation_api/group"/>
+</component>
+<component id="display_posting_api" name="Display Posting API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/display_posting_api/group"/>
+</component>
+<component id="eaac_plus_decoder_interface_api" name="eAAC Plus Decoder Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
+</component>
+<component id="eaac_plus_decoder_interface_msg_hdlr_api" name="eAAC Plus Decoder Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="eaac_plus_decoder_interface_proxy_api" name="eAAC Plus Decoder Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
+</component>
+<component id="error_concealment_interface_api" name="Error Concealment Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/error_concealment_interface_api/group"/>
+</component>
+<component id="error_concealment_interface_msg_hdlr_api" name="Error Concealment Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
+</component>
+<component id="error_concealment_interface_proxy_api" name="Error Concealment Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
+</component>
+<component id="fm_radio_adaptation_api" name="FM Radio Adaptation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+</component>
+<component id="g711_decoder_interface_api" name="G711 Decoder Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g711_decoder_interface_api/group"/>
+</component>
+<component id="g711_decoder_interface_msg_hdlr_api" name="G711 Decoder Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g711_decoder_interface_proxy_api" name="G711 Decoder Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
+</component>
+<component id="g711_encoder_interface_api" name="G711 Encoder Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_api/group"/>
+</component>
+<component id="g711_encoder_interface_msg_hdlr_api" name="G711 Encoder Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g711_encoder_interface_proxy_api" name="G711 Encoder Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_decoder_interface_api" name="G729 Decoder Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_api/group"/>
+</component>
+<component id="g729_decoder_interface_msg_hdlr_api" name="G729 Decoder Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="g729_decoder_interface_proxy_api" name="G729 Decoder Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_encoder_interface_api" name="G729 Encoder Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_api/group"/>
+</component>
+<component id="g729_encoder_interface_proxy_api" name="G729 Encoder Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
+</component>
+<component id="g729_encoder_interface_msg_hdlr_api" name="G729 Encoder Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="global_audio_settings_api" name="Global Audio Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/global_audio_settings_api/group"/>
+</component>
+<component id="global_audio_settings_definition_api" name="Global Audio Settings Definition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/global_audio_settings_definition_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_api" name="Ilbc Decoder Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_msg_hdlr_api" name="Ilbc Decoder Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="ilbc_decoder_interface_proxy_api" name="Ilbc Decoder Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_api" name="Ilbc Encoder Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_msg_hdlr_api" name="Ilbc Encoder Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="ilbc_encoder_interface_proxy_api" name="Ilbc Encoder Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+</component>
+<component id="mdf_plugin_uids" name="MDF Plug-in UIDs" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/mdf_plugin_uids/group"/>
+</component>
+<component id="multimedia_fourcc_definitions_api" name="Multimedia FourCC Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
+</component>
+<component id="nokia_audio_policy_header_api" name="Nokia Audio Policy Header API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
+</component>
+<component id="nokia_multimedia_fourcc_definitions_api" name="Nokia Multimedia Fourcc Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
+</component>
+<component id="ra8_decoder_interface_api" name="RA8 Decoder Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_api/group"/>
+</component>
+<component id="ra8_decoder_interface_msg_hdlr_api" name="RA8 Decoder Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="ra8_decoder_interface_proxy_api" name="RA8 Decoder Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
+</component>
+<component id="rds_adaptation_api" name="RDS Adaptation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/rds_adaptation_api/group"/>
+</component>
+<component id="restricted_audio_output_api" name="Restricted Audio Output API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/restricted_audio_output_api/group"/>
+</component>
+<component id="restricted_audio_output_msg_hdlr_api" name="Restricted Audio Output Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
+</component>
+<component id="restricted_audio_output_proxy_api" name="Restricted Audio Output Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
+</component>
+<component id="sbc_encoder_interface_api" name="SBC Encoder Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_api/group"/>
+</component>
+<component id="sbc_encoder_interface_msg_hdlr_api" name="SBC Encoder Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="sbc_encoder_interface_proxy_api" name="SBC Encoder Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
+</component>
+<component id="secure_output_mdf_custom_interface" name="Secure Output MDF Custom Interface" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
+</component>
+<component id="speech_encoder_config_api" name="Speech Encoder Config API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_api/group"/>
+</component>
+<component id="speech_encoder_config_msg_hdlr_api" name="Speech Encoder Config Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
+</component>
+<component id="speech_encoder_config_proxy_api" name="Speech Encoder Config Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
+</component>
+<component id="telephony_audio_routing_client_api" name="Telephony Audio Routing Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
+</component>
+<component id="telephony_audio_routing_manager_api" name="Telephony Audio Routing Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
+</component>
+<component id="video_buffer_management_mdf_custom_interface" name="Video Buffer Management MDF Custom Interface" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+</component>
+<component id="video_decoder_rotation_mdf_custom_interface" name="Video Decoder Rotation MDF Custom Interface" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+</component>
+<component id="video_decoder_scaling_mdf_custom_interface" name="Video Decoder Scaling MDF Custom Interface" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+</component>
+<component id="video_reclaim_extbuffers_ci" name="Video Reclaim Extbuffers Custom Interface" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
+</component>
+<component id="video_window_control_custom_interface" name="Video Window Control Custom Interface" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/video_window_control_custom_interface/group"/>
+</component>
+<component id="wma_decoder_interface_api" name="WMA Decoder Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_api/group"/>
+</component>
+<component id="wma_decoder_interface_msg_hdlr_api" name="WMA Decoder Interface Message Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
+</component>
+<component id="wma_decoder_interface_proxy_api" name="WMA Decoder Interface Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
+</component>
+<component id="eaacplusutil_api" name="EAac Plus Util API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/eaacplusutil_api/group"/>
+</component>
+<component id="frametable_api" name="Frametable API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/mm/mm_plat/frametable_api/group"/>
+</component>
+</collection>
 <collection id="devsoundextensions" name="Devsound Extensions" level="device-fw">
 <component id="drmaudioplayer" filter="s60" name="DRM Audio Player">
 <unit bldFile="/os/mm/devsoundextensions/drmaudioplayer/group"/>
 </component>
 <component id="mmextfw" filter="s60" name="Multimedia Extension Framework">
 <component id="mmfwplugins" name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" class="plugin">
 <unit bldFile="/os/mm/mmplugins/mmfwplugins/group" mrp="/os/mm/mmplugins/mmfwplugins/group/multimedia_mmf_plugin.mrp"/>
 </component>
 </collection>
 <collection id="mm_info" name="Multimedia Info" level="app-if">
-<component id="mm_plat" filter="s60" name="Multimedia Platform Interfaces" class="api">
-<unit bldFile="/os/mm/mm_plat/group"/>
-</component>
-<component id="mm_pub" filter="s60" name="Multimedia Public Interfaces" class="api">
-<unit bldFile="/os/mm/mm_pub/group"/>
-</component>
 <component id="mmdocs" name="Multimedia Documentation" purpose="development" class="doc">
 <unit mrp="/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
 </component>
 <component id="mm_tsrc" name="Multimedia Tests" purpose="development" filter="s60,test,api_test,pref_test">
 <unit bldFile="/os/mm/tsrc/group"/>
 <unit mrp="/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="/os/mm/mmapitest/devsoundexthaitest/group"/>
 </component>
 </collection>
 </package>
 <package id="imagingext" level="services" tech-domain="mm" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
+<component id="exif_api" name="Exif API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
+<unit bldFile="/os/imagingext/imagingext_pub/exif_api/tsrc/group" filter="test,api_test"/>
+</component>
+</collection>
+<collection id="imagingext_plat" name="Imaging Extensions Platform Interfaces" level="app-if">
+<component id="jpeg2000_icl_plugin_api" name="JPEG2000 ICL plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+</component>
+<component id="extended_icl_jpeg_api" name="Extended ICL Jpeg API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+<unit bldFile="/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="h324_annex_k_custom_api" name="H324 Annex K Custom API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+</component>
+<component id="ecam_orientation_custom_api" name="ECam Orientation Custom API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+</component>
+<component id="ecam_ui_orientation_override_custom_api" name="ECam UI Orientation Override Custom API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+</component>
+<component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
+</component>
+</collection>
 <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
 <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
 <unit bldFile="/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
 </component>
 <component id="imageadaptationextensions_build" filter="s60" name="Image Adaptation Extensions Build">
 <component id="exiflib" filter="s60" name="Exif Library">
 <unit bldFile="/os/imagingext/imagingmodules/exiflib/group"/>
 </component>
 <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
 <unit bldFile="/os/imagingext/imagingmodules/jp2kcodec/group"/>
-</component>
-</collection>
-<collection id="imagingext_info" name="Imaging Extensions Info" level="app-if">
-<component id="imagingext_plat" filter="s60" name="Imaging Extensions Platform Interfaces" class="api">
-<unit bldFile="/os/imagingext/imagingext_plat/group"/>
-</component>
-<component id="imagingext_pub" filter="s60" name="Imaging Extensions Public Interfaces" class="api">
-<unit bldFile="/os/imagingext/imagingext_pub/group"/>
-</component>
-<component id="imagingext_test" filter="s60,test,api_test" name="Imaging Extensions Platform API Tests" purpose="development">
-<unit bldFile="/os/imagingext/imagingext_plat/extended_icl_jpeg_api/tsrc/group"/>
-</component>
-<component id="imagingext_test" filter="s60,test,api_test" name="Imaging Extensions Public API Tests" purpose="development">
-<unit bldFile="/os/imagingext/imagingext_pub/exif_api/tsrc/group"/>
 </component>
 </collection>
 </package>
 <package id="graphics" level="services" tech-domain="ui" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
 <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
 </component>
 <component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
 <unit bldFile="/os/graphics/graphicstest/uibench/group" mrp="/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
 </component>
 </collection>
+<collection id="graphics_plat" name="Graphics Platform Interfaces" level="app-if">
+<component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
+<meta rel="Api"/>
+<unit bldFile="/os/graphics/graphics_plat/m3g_core_api/group"/>
+</component>
+</collection>
 <collection id="graphics_info" name="Graphics Info" level="app-if">
-<component id="m3g_core_api" filter="sf_build" name="M3G Core API" class="api">
-<unit bldFile="/os/graphics/graphics_plat/m3g_core_api/group"/>
-<!-- cope with missing graphics_plat/group -->
-</component>
 <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
 <unit mrp="/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
 </component>
 <component id="graphics_metadata" name="Graphics Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
 <unit mrp="/os/graphics/graphicsapitest/screendriverhaitest/group/screendriverhaitest.mrp" bldFile="/os/graphics/graphicsapitest/screendriverhaitest/group"/>
 </component>
 </collection>
 </package>
 <package id="textandloc" level="services" tech-domain="ui" name="Text and Localisation Services" levels="encoding util fonts tools text">
+<collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
+<component id="findutil_api" name="Find Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/textandloc/textandloc_plat/findutil_api/group"/>
+</component>
+<component id="japanese_language_utilities_api" name="Japanese Language Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
+</component>
+<component id="sortutil_api" name="Sorting Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/textandloc/textandloc_plat/sortutil_api/group"/>
+</component>
+</collection>
+<collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
+<component id="directory_localizer_api" name="Directory Localizer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+</component>
+</collection>
 <collection id="charconvfw" name="Character Conversion" level="encoding">
 <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
 <unit bldFile="/os/textandloc/charconvfw/charconv_fw/group" mrp="/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
 </component>
 <component id="charconvplugins" name="Character Encoding and Conversion Plugins" purpose="optional" class="plugin">
 <component id="bitmapfonttools" name="Bitmap Font Tools" purpose="development" target="desktop">
 <unit bldFile="/os/graphics/graphicstools/bitmapfonttools/group" mrp="/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
 </component>
 </collection>
 <collection id="textandloc_info" name="Text and Localisation Info" level="text">
-<component id="textandloc_pub" filter="s60" name="Text and Localisation Public Interfaces" class="api">
-<unit bldFile="/os/textandloc/textandloc_pub/group"/>
-</component>
-<component id="textandloc_plat" filter="s60" name="Text and Localisation Platform Interfaces" class="api">
-<unit bldFile="/os/textandloc/textandloc_plat/group"/>
-</component>
 <component id="textandloc_metadata" name="Text and Localisation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="xmlsrv" level="services" tech-domain="rt" name="XML Services" levels="plugin server framework generic specific">
+<collection id="xmlsrv_plat" name="XML Services Platform Interfaces" level="specific">
+<component id="xmlsrv_plat_build" name="XML Services Platform Interface Build" class="api" filter="s60">
+<!-- need to fix the configuration used here.
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
+	  Remove this component and uncomment the other units when fixed-->
+<unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
+</component>
+<component id="xml_encryption_api" name="XML Encryption API" class="api" filter="s60">
+<meta rel="Api"/>
+<!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+</component>
+<component id="xml_signature_api" name="XML Signature API" class="api" filter="s60">
+<meta rel="Api"/>
+<!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+</component>
+<component id="xml_security_engine_utils_api" name="XML Security Engine Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+</component>
+</collection>
 <collection id="xmlsecurityengine" name="XML Security Engine" level="framework">
 <component id="xmlseccertman" filter="s60" name="XML Security Certificate Manager">
 <unit bldFile="/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
 </component>
 <component id="xmlsec" filter="s60" name="XML Security">
 <component id="wbxmlparser" name="WBXML Parser" introduced="7.0s" purpose="optional" class="plugin">
 <unit bldFile="/os/xmlsrv/xml/wbxmlparser/group" mrp="/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
 </component>
 </collection>
 <collection id="xmlsrv_info" name="XML Services Info" level="specific">
-<component id="xmlsrv_plat" filter="s60" name="XML Services Platform Interfaces" class="api">
-<unit bldFile="/os/xmlsrv/xmlsrv_plat/group"/>
-</component>
 <component id="xmlsrv_metadata" name="XML Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <unit bldFile="/os/osrndtools/stif/group"/>
 </component>
 </collection>
 <collection id="memspy" name="Memspy" level="trace">
 <component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+<meta rel="Api"/>
 <unit bldFile="/os/osrndtools/memspy/memspy_plat/group"/>
 </component>
 <component id="driver" filter="s60" name="Memspy Driver" purpose="development">
 <unit bldFile="/os/osrndtools/memspy/driver/group"/>
 </component>
 <unit bldFile="/os/osrndtools/memspy/group"/>
 </component>
 </collection>
 <collection id="hti" name="Harmonized Test Interface" level="trace">
 <component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
+<meta rel="Api"/>
 <unit bldFile="/os/osrndtools/hti/hti_plat/group"/>
 </component>
 <component id="hticfg" filter="s60" name="HTI Config" purpose="development">
 <unit bldFile="/os/osrndtools/hti/hticfg/group"/>
 </component>
 <!--  move exports into self-contained component.-->
 <unit bldFile="/os/osrndtools/hti/group"/>
 </component>
 </collection>
 <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
-<component id="osrndtools_plat" filter="s60" name="OS R&amp;D tools Platform Interfaces" class="api" purpose="development">
-<unit bldFile="/os/osrndtools/osrndtools_plat/group"/>
-<!-- currently empty. Remove? -->
-</component>
 <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
 </component>
 </collection>
 </package>
 </layer>
 <layer id="mw" name="Middleware" levels="generic specific">
 <package id="appsupport" level="generic" tech-domain="rt" name="Generic Application Support" levels="system plugin framework server generic specific">
+<collection id="appsupport_pub" name="Generic Application Support Public Interfaces" level="specific">
+<component id="flash_viewer_framework_api" name="Flash Viewer Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+</component>
+<component id="network_status_api" name="Network Status API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_pub/network_status_api/group"/>
+</component>
+</collection>
+<collection id="appsupport_plat" name="Generic Application Support Platform Interfaces" level="specific">
+<component id="action_plugin_api" name="Action Plug-In API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+</component>
+<component id="application_orientation_api" name="Application Orientation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+</component>
+<component id="context_access_api" name="Context Access API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/context_access_api/group"/>
+</component>
+<component id="context_framework_services_api" name="Context Framework Services API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+</component>
+<component id="context_framework_client_api" name="Context Framework Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+</component>
+<component id="context_framework_listener_api" name="Context Framework Listener API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+</component>
+<component id="context_framework_version_api" name="Context Framework Version API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+</component>
+<component id="context_source_plugin_api" name="Context Source Plug-In API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+</component>
+<component id="context_source_settings_manager_api" name="Context Source Settings Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+</component>
+<component id="context_subscription_api" name="Context Subscription API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+</component>
+<component id="key_event_framework_api" name="Key Event Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+</component>
+<component id="key_event_framework_mapper_api" name="Key Event Framework Mapper API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+</component>
+<component id="media_keys_definition_api" name="Media Keys Definition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+</component>
+<component id="ood_threshold_api" name="OOD Threshold API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+</component>
+<component id="oom_monitor_api" name="OOM Monitor API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+</component>
+<component id="oom_monitor_plugin_api" name="OOM Monitor Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+</component>
+<component id="operation_provider_api" name="Operation Provider API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+</component>
+<component id="phonecmdhandler_api" name="Phone Command Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+</component>
+<component id="restore_factory_settings_api" name="Restore Factory Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+</component>
+<component id="restore_factory_settings_plugin_api" name="Restore Factory Settings Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+</component>
+<component id="secondary_display_accfw_api" name="Secondary Display Accessory Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+</component>
+<component id="secondary_display_startup_api" name="Secondary Display Startup API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+</component>
+<component id="secondary_display_sysap_api" name="Secondary Display System Application API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+</component>
+<component id="secondary_display_system_state_api" name="Secondary Display System State API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+</component>
+<component id="sensor_user_setting_api" name="Sensor User Setting API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+</component>
+<component id="startup_configuration_api" name="Startup Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+</component>
+<component id="system_application_key_handler_plugin_api" name="System Application Key Handler Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+</component>
+<component id="system_application_light_control_plugin_api" name="System Application Light Control Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+</component>
+<component id="system_application_notification_api" name="System Application Notification API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+</component>
+<component id="system_application_plugin_callback_api" name="System Application Plug-in Callback API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+</component>
+</collection>
 <collection id="contextframework" name="Context Framework" level="framework">
 <!-- the units that are commented out need to be put back when configuration is in place.
 		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component id="cfw" filter="s60" name="Context Framework">
 <meta rel="config">
 <unit bldFile="/mw/appsupport/tzservices/tzloc/group" mrp="/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
 </component>
 <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
 <unit bldFile="/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
 </component>
-<component id="tzdatabase" name="Time Zone Database" filter="test" introduced="9.1" purpose="optional" class="config">
+<component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
 <unit bldFile="/mw/appsupport/tzservices/tzdatabase/group" mrp="/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
 </component>
 </collection>
 <collection id="contenthandling" name="Content Handling" level="plugin">
 <component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin">
 <component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
 <unit bldFile="/mw/appsupport/tzpcside/tzcompiler/group" mrp="/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
 </component>
 </collection>
 <collection id="appsupport_info" name="Generic Application Support Info" level="specific">
-<component id="appsupport_plat" filter="s60" name="Generic Application Support Platform Interfaces" class="api">
-<unit bldFile="/mw/appsupport/appsupport_plat/group"/>
-</component>
-<component id="appsupport_pub" filter="s60" name="Generic Application Support Public Interfaces" class="api">
-<unit bldFile="/mw/appsupport/appsupport_pub/group"/>
-</component>
 <component id="appsupport_metadata" name="Generic Application Support Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="securitysrv" level="generic" tech-domain="se" name="Security Services" levels="plugin framework server generic specific">
+<collection id="secsrv_plat" name="Security Services Platform Interfaces" level="specific">
+<component id="cms_api" name="CMS API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/cms_api/group"/>
+</component>
+<component id="pkcs12_parser_api" name="PKCS12 Parser API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+</component>
+<component id="java_utils_api" name="Java Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+</component>
+<component id="wim_cert_api" name="WIM Cert API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+</component>
+<component id="device_key_store_encryption_plugin_api" name="Device Key Store Encryption Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+</component>
+<component id="x509certnameparser_api" name="X.509 Certificate Name Parser API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+</component>
+<component id="remote_lock_api" name="Remote Lock API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+</component>
+<component id="pkidialog_api" name="PKI Dialog API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+</component>
+<component id="provisioning_api" name="Provisioning API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+</component>
+<component id="keyguard_configuration_api" name="Keyguard Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+</component>
+<component id="keylock_policy_api" name="Keylock Policy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+</component>
+<component id="security_code_ui_api" name="Security Code UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+</component>
+<component id="gba_api" name="GBA API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/securitysrv/secsrv_plat/gba_api/group"/>
+</component>
+<component id="keyguard_access_api" name="Keyguard Access API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+</component>
+<component id="devicelock_access_api" name="Device Lock Access API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
+</component>
+<component id="lockapp_server_api" name="Lock Application Server API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
+</component>
+<component id="devencadaptation_api" name="Device Encryption Adaptation API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+</component>
+<component id="devenccommonutils_api" name="Device Encryption Common Utils API" class="api" filter="s60">
+<unit bldFile="/mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
+</component>
+</collection>
 <collection id="cms" name="Certificate Management Service" level="server">
 <!-- collection is really a component. Need to move down a directory-->
 <component id="cms_build" filter="s60" name="CMS" introduced="^3">
 <unit bldFile="/mw/securitysrv/cms/group"/>
 </component>
 <!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
 <unit bldFile="/mw/securitysrv/devencdiskutils/group"/>
 </component>
 </collection>
 <collection id="securitysrv_info" name="Security Services Info" level="specific">
-<component id="secsrv_plat" name="Security Services Platform Interfaces" filter="s60" class="api">
-<unit bldFile="/mw/securitysrv/secsrv_plat/group"/>
-</component>
 <component id="securitysrv_test" filter="s60,test,api_test" purpose="development" name="Security Services Test">
 <unit bldFile="/mw/securitysrv/tsrc/group"/>
 </component>
 <component id="securitysrv_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="drm" level="generic" tech-domain="se" name="DRM" levels="plugin framework server generic specific">
+<collection id="drm_plat" name="DRM Platform Interfaces" level="specific">
+<component id="roap_api" name="ROAP API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/roap_api/group"/>
+</component>
+<component id="drm_common_api" name="DRM Common API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/drm_common_api/group"/>
+</component>
+<component id="drm_rights_api" name="DRM Rights API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/drm_rights_api/group"/>
+</component>
+<component id="drm_legacy_api" name="DRM Legacy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/drm_legacy_api/group"/>
+</component>
+<component id="dcf_repository_api" name="DCF Repository API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/dcf_repository_api/group"/>
+</component>
+<component id="drm_service_api" name="DRM Service API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/drm_service_api/group"/>
+</component>
+<component id="drm_secondary_display_api" name="DRM Secondary Display API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/drm_secondary_display_api/group"/>
+</component>
+<component id="drm_license_manager_api" name="DRM License Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/drm_license_manager_api/group"/>
+</component>
+<component id="drm_utility_api" name="DRM Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/drm_utility_api/group"/>
+</component>
+<component id="drm_agents_api" name="DRM Agents API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/drm_agents_api/group"/>
+</component>
+<component id="wmdrm_core_api" name="WM DRM Core API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/wmdrm_core_api/group"/>
+</component>
+<component id="wmdrm_access_api" name="WMDRM Access API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_plat/wmdrm_access_api/group"/>
+</component>
+<component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA_DRM"/>
+</meta>
+<unit bldFile="/mw/drm/drm_plat/camese_utility_api/group"/>
+</component>
+<component id="camese_framework_api" name="Camese Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA_DRM"/>
+</meta>
+<unit bldFile="/mw/drm/drm_plat/camese_framework_api/group"/>
+</component>
+</collection>
+<collection id="drm_pub" name="DRM Public Interfaces" level="specific">
+<component id="drm_helper_api" name="DRM Helper API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_pub/drm_helper_api/group"/>
+</component>
+<component id="oma_drm_caf_agent_api" name="OMA DRM CAF Agent API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+</component>
+<component id="drm_license_checker_api" name="DRM License Checker API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/drm/drm_pub/drm_license_checker_api/group"/>
+</component>
+</collection>
 <collection id="commondrm" name="Common DRM" level="generic">
 <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
 <component id="drmencryptor" filter="s60" name="DRM Encryptor">
 <!-- this should have its own bld.inf or be removed as a component -->
 </component>
 <component id="wmdrm_build" filter="s60" name="WM DRM Build">
 <unit bldFile="/mw/drm/wmdrm/group"/>
 </component>
 </collection>
 <collection id="drm_info" name="DRM Info" level="specific">
-<component id="drm_pub" filter="s60" name="DRM Public Interfaces" class="api">
-<unit bldFile="/mw/drm/drm_pub/group"/>
-</component>
-<component id="drm_plat" filter="s60" name="DRM Platform Interfaces" class="api">
-<unit bldFile="/mw/drm/drm_plat/group"/>
-</component>
 <component id="drm_api_test" filter="s60,test,api_test" name="DRM Build" purpose="development">
 <unit bldFile="/mw/drm/tsrc/group"/>
 </component>
 </collection>
 </package>
 <package id="locationsrv" level="specific" tech-domain="lo" name="Location Services" levels="plugin fw server if">
+<collection id="locsrv_pub" name="Location Services Public Interfaces" level="if">
+<component id="landmarks_search_api" name="Landmarks Search API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+</component>
+<component id="landmarks_api" name="Landmarks API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_api/group"/>
+</component>
+<component id="landmarks_database_management_api" name="Landmarks Database Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
+</component>
+<component id="location_triggering_api" name="Location Triggering API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
+</component>
+<component id="blid_application_satellite_info_api" name="BLID Application Satellite Info API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
+</component>
+</collection>
+<collection id="locsrv_plat" name="Location Services Platform Interfaces" level="if">
+<component id="map_and_navigation_api" name="Map and Navigation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
+</component>
+<component id="map_and_navigation_provider_discovery_api" name="Map and Navigation Provider Discovery API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
+</component>
+<component id="geocoding_api" name="Geocoding API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+</component>
+<component id="map_image_api" name="Map Image API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_image_api/group"/>
+</component>
+<component id="map_and_navigation_aiw_api" name="Map and Navigation AIW API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
+</component>
+<component id="map_and_navigation_provider_api" name="Map and Navigation Provider API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
+</component>
+<component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
+</component>
+<component id="supl_settings_api" name="SUPL Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
+</component>
+<component id="location_settings_launch_api" name="Location Settings Launch API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
+</component>
+<component id="map_image_conversion_plugin_api" name="Map Image Conversion Plug-In API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
+</component>
+<component id="psy_configuration_ui_plugin_api" name="PSY Configuration UI Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
+</component>
+<component id="np_proxy_configuration_api" name="NP Proxy Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+</component>
+<component id="supl_terminal_initiation_api" name="SUPL Terminal Initiation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
+</component>
+<component id="location_notation_preferences_settings_api" name="Location Notation Preferences Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
+</component>
+<component id="supl_settings_notifier_secondary_display_api" name="SUPL Settings Notifier Secondary Display API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
+</component>
+<component id="supl_network_initiation_api" name="SUPL Network Initiation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+</component>
+<component id="privacy_notifiers_secondary_display_api" name="Privacy Notifiers Secondary Display API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
+</component>
+<component id="oma_supl_configuration_parameter_api" name="OMA SUPL Configuration Parameter API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+</component>
+<component id="supl_query_secondary_display_api" name="SUPL Query Secondary Display API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
+</component>
+<component id="location_triggering_management_api" name="Location Triggering Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
+</component>
+<component id="location_triggering_status_information_api" name="Location Triggering Status Information API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
+</component>
+<component id="oma_supl_asn_codec_plugin_api" name="OMA SUPL ASN Codec Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+</component>
+<component id="location_local_variation_api" name="Location Local Variation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+</component>
+</collection>
 <collection id="genericpositioningplugins" name="Generic Positioning Plugins" level="plugin">
 <component id="locationnpppsy" filter="s60" name="Location Positioning Proxy PSY" class="plugin">
 <unit bldFile="/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
 </component>
 <component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
 <component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
 <!--  should remove #include from this and maybe put exports in the above components -->
 <unit bldFile="/mw/locationsrv/locationtriggering/group"/>
 </component>
 </collection>
-<collection id="locationsrv_info" name="Location Services Info" level="if">
-<component id="locsrv_plat" filter="s60" class="api" name="Location Services Platform Interfaces">
-<unit bldFile="/mw/locationsrv/locsrv_plat/group"/>
-</component>
-<component id="locsrv_pub" filter="s60" class="api" name="Location Services Public Interfaces">
-<unit bldFile="/mw/locationsrv/locsrv_pub/group"/>
-</component>
-</collection>
 </package>
 <package id="accesssec" level="generic" tech-domain="dc" name="Access Security" levels="plugin framework server generic specific">
+<collection id="accesssec_plat" name="Access Security Platform Interfaces" level="specific">
+<component id="wapi_security_settings_ui_api" name="WAPI Security Settings UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
+</component>
+<component id="wep_security_settings_ui_api" name="WEP Security Settings UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
+</component>
+<component id="wi-fi_protected_setup_ui_api" name="Wi-Fi Protected Setup UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
+</component>
+<component id="wlan_eap_settings_ui_api" name="WLAN EAP Settings UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
+</component>
+<component id="wpa_security_settings_ui_api" name="WPA Security Settings UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
+</component>
+<component id="eap_vpn_api" name="EAP VPN API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
+</component>
+<component id="eapsim_db_api" name="EAP-SIM DB API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
+</component>
+<component id="eap_type_api" name="EAP Type API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/eap_type_api/group"/>
+</component>
+<component id="eaptlspeap_db_api" name="EAP-TLS-PEAP DB API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
+</component>
+<component id="eapleap_db_api" name="LEAP DB API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
+</component>
+<component id="eapgtc_db_api" name="EAP-GTC DB API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
+</component>
+<component id="eapmschapv2_db_api" name="EAP-MSCHAPV2 DB API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
+</component>
+<component id="eapaka_db_api" name="EAP-AKA DB API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
+</component>
+<component id="wapi_db_api" name="WAPI DB API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/accesssec/accesssec_plat/wapi_db_api/group"/>
+</component>
+</collection>
 <collection id="wlansecuritysettings" name="WLAN Security Settings" level="specific">
 <component id="wapisecuritysettingsui" filter="s60" name="WAPI Security Settings UI" introduced="9.1">
 <!-- the directory for this needs to be moved up to the right level -->
 <unit bldFile="/mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
 </component>
 <collection id="eapol" name="EAPOL" level="framework">
 <component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
 <unit bldFile="/mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
 </component>
 </collection>
-<collection id="accesssec_info" name="Access Security Info" level="specific">
-<component id="accesssec_plat" filter="s60" name="Access Security Platform Interfaces" class="api">
-<unit bldFile="/mw/accesssec/accesssec_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="ipconnmgmt" level="generic" tech-domain="dc" name="IP Connectivity Management" levels="plugin framework server generic utils">
+<collection id="ipcm_plat" name="IP Connectivity Management Platform Interfaces" level="utils">
+<component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
+</component>
+<component id="bearer_settings_plugin_api" name="Bearer Settings Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
+</component>
+<component id="commsdat_wlan_api" name="CommsDat WLAN API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
+</component>
+<component id="connection_monitor_extension_api" name="Connection Monitor Extension API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
+</component>
+<component id="connection_ui_utilities_api" name="Connection UI Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
+</component>
+<component id="disconnect_dialog_api" name="Disconnect Dialog API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
+</component>
+<component id="disconnect_dialog_disable_api" name="Disconnect Dialog Disable API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
+</component>
+<component id="extended_connection_settings_api" name="Extended Connection Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
+</component>
+<component id="mpm_default_connection_api" name="MPM Default Connection API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+</component>
+<component id="pdpcontextmanager2_reset_factory_settings_api" name="PDP Context Manager 2 Reset Factory Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
+</component>
+<component id="pdpcontextmanager2_settings_api" name="PDP Context Manager 2 Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+</component>
+<component id="mpm_connect_screen_api" name="MPM Connect Screen API" class="api" filter="s60">
+<unit bldFile="/mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
+</component>
+</collection>
+<collection id="ipcm_pub" name="IP Connectivity Management Public Interfaces" level="utils">
+<component id="connection_settings_api" name="Connection Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
+</component>
+<component id="access_point_engine_api" name="Access Point Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
+</component>
+<component id="access_point_settings_handler_api" name="Access Point Settings Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
+</component>
+<component id="data_connection_log_counters_api" name="Data Connection Log Counters API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
+</component>
+<component id="connection_monitor_server_api" name="Connection Monitor Server API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
+</component>
+<component id="connection_settings_ui_api" name="Connection Settings UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
+</component>
+<component id="agent_dialog_api" name="Agent Dialog API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
+</component>
+<component id="extendedconnpref_api" name="Extended Connection Preferences API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
+</component>
+</collection>
 <collection id="accesspointcontrol" name="Access Point Control" level="plugin">
 <component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
 <unit bldFile="/mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
 </component>
 </collection>
 <!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
 <unit bldFile="/mw/ipconnmgmt/dbcreator/group"/>
 </component>
 </collection>
 <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="utils">
-<component id="ipcm_pub" filter="s60" class="api" name="IP Connectivity Management Public Interfaces">
-<unit bldFile="/mw/ipconnmgmt/ipcm_pub/group"/>
-</component>
-<component id="ipcm_plat" filter="s60" class="api" name="IP Connectivity Management Platform Interfaces">
-<unit bldFile="/mw/ipconnmgmt/ipcm_plat/group"/>
-</component>
 <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
 <!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
 <unit bldFile="/mw/ipconnmgmt/group"/>
 </component>
 </collection>
 </package>
 <package id="netprotocols" level="generic" tech-domain="dc" name="High-level Internet Protocols" levels="plugin framework server generic specific">
+<collection id="netprotocols_plat" name="High-level Internet Protocols Platform Interfaces" level="specific">
+<component id="cookie_manager_api" name="Cookie Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
+</component>
+<component id="http_cache_mgr_api" name="HTTP Cache Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
+</component>
+<component id="http_filters_api" name="HTTP Filters API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
+</component>
+</collection>
 <collection id="httpfilters" name="HTTP Filters" level="plugin">
 <component id="httpfiltercommon" filter="s60" name="HTTP Filter Common">
 <unit bldFile="/mw/netprotocols/httpfilters/httpfiltercommon/group"/>
 </component>
 <component id="cookie" filter="s60" name="Cookie Filter" class="plugin">
 <component id="httptransportplugins" name="HTTP Transport Plugins" introduced="6.2" purpose="optional" class="plugin">
 <unit bldFile="/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
 </component>
 </collection>
 <collection id="netprotocols_info" name="High-level Internet Protocols Info" level="specific">
-<component id="netprotocols_plat" filter="s60" name="High-level Internet Protocols Platform Interfaces" class="api">
-<unit bldFile="/mw/netprotocols/netprotocols_plat/group"/>
-</component>
 <component id="netprotocols_metadata" name="High-level Internet Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="ipappprotocols" level="generic" tech-domain="dc" name="IP App Protocols" levels="plugin conn server if">
+<collection id="ipappprotocols_plat" name="IP App Protocols Platform Interfaces" level="if">
+<component id="srtp_api" name="SRTP API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+</component>
+<component id="rtprtcp_api" name="RTP/RTCP API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
+</component>
+</collection>
 <collection id="rtp" name="RTP" level="server">
 <component id="srtpstack" filter="s60" name="SRTP Stack">
 <unit bldFile="/mw/ipappprotocols/rtp/srtpstack/group"/>
 </component>
 <component id="rtpstack" filter="s60" name="RTP Stack">
 <component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="/mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
 </component>
 </collection>
 <collection id="ipappprotocols_info" name="IP App Protocols Info" level="if">
-<component id="ipappprotocols_plat" filter="s60" name="IP App Protocols Platform Interfaces" class="api">
-<unit bldFile="/mw/ipappprotocols/ipappprotocols_plat/group"/>
-</component>
 <component id="ipappprotocols_metadata" name="IP App Protocols Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="wirelessacc" level="specific" tech-domain="dc" name="Wireless Access" levels="framework generic ui">
+<collection id="hsfw_plat" name="HotSpot Framework Platform Interfaces" level="ui">
+<component id="hotspot_framework_client_api" name="HotSpot Framework Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+</component>
+<component id="internet_connectivity_test_service_api" name="Internet Connectivity Test Service API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+</component>
+<component id="internet_connectivity_test_service_settings_api" name="Internet Connectivity Test Service Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+</component>
+<component id="hotspot_framework_client_plugin_api" name="HotSpot Framework Client Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+</component>
+</collection>
 <collection id="hotspotfw" name="HotSpot Framework" level="framework">
 <component id="hsserver" filter="s60" name="HotSpot Server">
 <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
 </component>
 <component id="hsclient" filter="s60" name="HotSpot Client">
 </component>
 <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
 <unit bldFile="/mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
 </component>
 </collection>
-<collection id="wirelessacc_info" name="Wireless Access Info" level="ui">
-<component id="hsfw_plat" name="HotSpot Framework Platform Interfaces" filter="s60" class="api">
-<unit bldFile="/mw/wirelessacc/hsfw_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="vpnclient" level="specific" tech-domain="dc" name="VPN Client" levels="engine ui api">
 <!-- is the !oem_build filter needed? -->
+<collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
+<component id="vpnapi" filter="s60" class="api" name="VPN API">
+<meta rel="Api"/>
+<unit bldFile="/mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
+</component>
+</collection>
 <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
 <component id="vpnapi" filter="s60" name="VPN API">
 <unit bldFile="/mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
 </component>
 </collection>
 </component>
 <component id="vpnclient_build" filter="s60" name="VPN Client Build">
 <!-- should split this up into the other components and remove this-->
 <unit bldFile="/mw/vpnclient/group" filter="!oem_build"/>
 </component>
-<component id="vpnc_plat" filter="s60" class="api" name="VPN Client Platform Interfaces">
-<unit bldFile="/mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-</component>
 </collection>
 </package>
 <package id="ipappsrv" level="specific" tech-domain="vc" name="IP App Services" levels="framework generic server conn plugin">
+<collection id="ipappsrv_plat" name="IP App Services Platform Interfaces" level="plugin">
+<component id="transcoder_api" name="Transcoder API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+</component>
+<component id="comms_event_api" name="Comms Event API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
+</component>
+<component id="floor_control_api" name="Floor Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
+</component>
+<component id="media_control_api" name="Media Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
+</component>
+<component id="multimedia_comms_api" name="Multimedia Comms API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
+</component>
+<component id="nat_settings_api" name="NAT Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
+</component>
+</collection>
 <collection id="natfw" name="NAT Framework" level="framework">
 <!-- collection is really a component. Need to move down a directory -->
 <component id="natfw_build" filter="s60" name="NAT Framework Build" introduced="^2">
 <unit bldFile="/mw/ipappsrv/natfw/group"/>
 </component>
 <component id="natpnatfwsdpprovider" filter="s60" name="NAT Framework SDP Provider" class="plugin">
 <unit bldFile="/mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
 </component>
 </collection>
 <collection id="ipappsrv_info" name="IP App Services Info" level="plugin">
-<component id="ipappsrv_plat" filter="s60" name="IP App Services Platform Interfaces" class="api">
-<unit bldFile="/mw/ipappsrv/ipappsrv_plat/group"/>
-</component>
 <component id="ipappsrv_build" name="IP App Services Build" filter="s60">
 <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
 <unit mrp="/mw/ipappsrv/group"/>
 </component>
 <component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/ipappsrv/ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="phonesrv" level="specific" tech-domain="vc" name="Telephony and SIM Services" levels="plugin framework server generic specific">
+<collection id="phonesrv_plat" name="Telephony and SIM Services Platform Interfaces" level="specific">
+<component id="string_parser_api" name="String Parser API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+</component>
+<component id="cbs_mcn_client_api" name="CBS MCN Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+</component>
+<component id="converged_call_engine_api" name="Converged Call Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+</component>
+<component id="aiw_dial_data_consumer_api" name="AIW Dial Data Consumer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+</component>
+<component id="phone_client_ussd_api" name="Phone Client USSD API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+</component>
+<component id="sat_refresh_api" name="SAT Refresh API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+<unit unitID="tedo.sat_refresh_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="network_handling_engine_api" name="Network Handling Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+</component>
+<component id="phone_client_emergency_call_api" name="Phone Client Emergency Call API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+</component>
+<component id="sat_configuration_api" name="SAT Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+</component>
+<component id="dial_utils_api" name="Dial Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+</component>
+<component id="phone_client_image_handler_api" name="Phone Client Image Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+</component>
+<component id="phone_client_messenger_api" name="Phone Client Messenger API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+</component>
+<component id="sat_client_api" name="SAT Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+<unit unitID="tedo.sat_client_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="phone_client_api" name="Phone Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+</component>
+<component id="sat_service_api" name="SAT Service API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+<unit unitID="tedo.sat_service_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="cbs_message_api" name="CBS Message API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+</component>
+<component id="phone_client_server_information_api" name="Phone Client Server Information API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+</component>
+<component id="phone_client_ussd_internal_api" name="Phone Client USSD Internal API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+</component>
+<component id="phone_client_command_handler_api" name="Phone Client Command Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+</component>
+<component id="phone_client_notify_api" name="Phone Client Notify API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+</component>
+<component id="phone_client_utility_api" name="Phone Client Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+</component>
+<component id="telephony_network_information_api" name="Telephony Network Information API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+</component>
+<component id="secondary_display_sat_api" name="Secondary Display SAT API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+</component>
+<component id="callui_reconnect_query_api" name="CallUI Reconnect Query API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+</component>
+<component id="service_provider_settings_api" name="Service Provider Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+</component>
+<component id="converged_call_provider_api" name="Converged Call Provider API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+</component>
+<component id="incoming_call_monitor_api" name="Incoming Call Monitor API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+</component>
+<component id="default_emergency_numbers_api" name="Default Emergency Numbers API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+</component>
+<component id="cenrep_database_api" name="Central Repository Database API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+</component>
+<component id="ss_settings_api" name="SS Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+</component>
+<component id="phone_settings_observer_api" name="Phone Settings Observer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+</component>
+<component id="phone_settings_notes_ui_api" name="Phone Settings Notes UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+</component>
+<component id="phone_settings_api" name="Phone Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+</component>
+<component id="voice_mailbox_number_api" name="Voice Mailbox Number API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+</component>
+<component id="voice_mailbox_settings_api" name="Voice Mailbox Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+</component>
+<component id="call_information_api" name="Call Information API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+<unit unitID="tedo.call_information_api.test" bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="call_remote_party_information_api" name="Call Remote Party Information API" class="api" filter="s60">
+<unit bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+<unit unitID="tedo.call_remote_party_information_api.test" bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
+</component>
+</collection>
 <collection id="telutils" name="Telephony Utils" level="generic">
 <component id="phoneparser" filter="s60" name="Phone Parser">
 <unit bldFile="/mw/phonesrv/telutils/phoneparser/group"/>
 </component>
 <component id="telephonyservice" filter="s60" name="Telephony Service">
 <component id="phonecmdhnlr" filter="s60" name="Phone Command Handler">
 <unit bldFile="/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
 </component>
 </collection>
 <collection id="phonesrv_info" name="Telephony and SIM Services Info" level="specific">
-<component id="phonesrv_plat" filter="s60" name="Telephony and SIM Services Platform Interfaces" class="api">
-<unit bldFile="/mw/phonesrv/phonesrv_plat/group"/>
-</component>
-<component id="phonesrv_pub" filter="s60" name="Telephony and SIM Services Public Interfaces" class="api">
-<unit bldFile="/mw/phonesrv/phonesrv_pub/group"/>
-</component>
 <component id="phonesrv_test" filter="s60,test,api_test" name="Telephony and SIM Services Tests" purpose="development">
 <!-- can only have one unit. Need to #include from a single bld.inf  (phonesrv_plat/tsrc/bld.inf?) -->
-<unit unitID="tedo.call_information_api.test" bldFile="/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/>
-<unit unitID="tedo.sat_client_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/>
-<unit unitID="tedo.sat_refresh_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/>
-<unit unitID="tedo.sat_service_api.test" bldFile="/mw/phonesrv/phonesrv_plat/sat_service_api/tsrc/group"/>
 <unit unitID="tedo.telephony_mediator_api.test" bldFile="/mw/phonesrv/phonesrv_plat/telephony_mediator_api/tsrc/ut_telephony_mediator_api/group"/>
-<unit unitID="tedo.call_remote_party_information_api.test" bldFile="/mw/phonesrv/phonesrv_plat/call_remote_party_information_api/tsrc/group"/>
 </component>
 </collection>
 </package>
 <package id="messagingmw" level="specific" tech-domain="pr" name="Messaging Middleware" levels="stack fw api">
+<collection id="msgfw_pub" name="Messaging Middleware Public Interfaces" level="api">
+<component id="send_ui_api" name="Send UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/messagingmw/msgfw_pub/send_ui_api/group"/>
+</component>
+</collection>
+<collection id="msgfw_plat" name="Messaging Middleware Platform Interfaces" level="api">
+<component id="always_online_plugin_api" name="Always Online Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
+</component>
+<component id="always_online_client_api" name="Always Online Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
+</component>
+<component id="msg_common_utils_api" name="Messaging Common Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+</component>
+<component id="send_ui_plugin_api" name="Send UI Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
+</component>
+<component id="send_ui_datautils_api" name="Send UI Data Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
+</component>
+</collection>
 <collection id="msgbranched" name="Messaging Branched" level="fw">
 <!-- collection is really a component. Need to move down a directory -->
 <component id="msgbranched_build" filter="s60" name="Messaging Branched Build">
 <unit bldFile="/mw/messagingmw/msgbranched/group"/>
 </component>
 <component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="/mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
 </component>
 </collection>
 <collection id="messagingmw_info" name="Messaging Middleware Info" level="api">
-<component id="msgfw_plat" filter="s60" name="Messaging Middleware Platform Interfaces" class="api">
-<unit bldFile="/mw/messagingmw/msgfw_plat/group"/>
-</component>
-<component id="msgfw_pub" filter="s60" name="Messaging Middleware Public Interfaces" class="api">
-<unit bldFile="/mw/messagingmw/msgfw_pub/group"/>
-</component>
 <component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="imsrv" level="specific" tech-domain="pr" name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+<collection id="imsrv_plat" name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+<component id="ximp_core_data_model_api" name="XIMP Core Data Model API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
+</component>
+<component id="ximp_presence_protocol_plugin_host_api" name="XIMP Presence Protocol Plug-in Host API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_presence_data_model_api" name="XIMP Presence Data Model API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
+</component>
+<component id="ximp_presence_protocol_plugin_api" name="XIMP Presence Protocol Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_presence_management_api" name="XIMP Presence Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
+</component>
+<component id="ximp_core_protocol_plugin_host_api" name="XIMP Core Protocol Plug-in Host API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_core_management_api" name="XIMP Core Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
+</component>
+<component id="ximp_presence_base_api" name="XIMP Presence Base API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
+</component>
+<component id="ximp_core_protocol_plugin_api" name="XIMP Core Protocol Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_core_base_api" name="XIMP Core Base API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
+</component>
+<component id="ximp_presence_cache_api" name="XIMP Presence Cache API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
+</component>
+<component id="ximp_core_feature_plugin_api" name="XIMP Core Feature Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
+</component>
+<component id="ximp_im_protocol_plugin_host_api" name="XIMP IM Protocol Plugin Host API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_im_data_model_api" name="XIMP IM Data Model API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
+</component>
+<component id="ximp_im_protocol_plugin_api" name="XIMP IM Protocol Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_im_management_api" name="XIMP IM Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
+</component>
+<component id="ximp_im_base_api" name="XIMP IM Base API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
+</component>
+<component id="ximp_search_protocol_plugin_host_api" name="XIMP Search Protocol Plugin Host API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+</component>
+<component id="ximp_search_data_model_api" name="XIMP Search Data Model API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
+</component>
+<component id="ximp_search_protocol_plugin_api" name="XIMP search Protocol Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+</component>
+<component id="ximp_search_management_api" name="XIMP Search Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
+</component>
+<component id="ximp_search_base_api" name="XIMP Search Base API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
+</component>
+<component id="xmpp_settings_api" name="XMPP Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
+</component>
+<component id="im_cache_client_api" name="IM Cache Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
+</component>
+<component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
+</component>
+<component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+<unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
+</component>
+</collection>
 <collection id="ximpfw" name="XIMP Framework" level="framework">
 <!-- collection is really a component. Needs to be moved down a directory -->
 <component id="ximpfw_build" filter="s60" name="XIMP Framework Build">
 <unit bldFile="/mw/imsrv/ximpfw/group"/>
 </component>
 <!-- collection is really a component. Needs to be moved down a directory -->
 <component id="brandingserver_build" filter="s60" name="Branding Server Build">
 <unit bldFile="/mw/imsrv/brandingserver/group"/>
 </component>
 </collection>
-<collection id="imsrv_info" name="Instant Messaging and Presence Services Info" level="specific">
-<component id="imsrv_plat" filter="s60" name="Instant Messaging and Presence Services Platform Interfaces" class="api">
-<unit bldFile="/mw/imsrv/imsrv_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="legacypresence" level="specific" tech-domain="pr" name="Legacy Presence Services" levels="engine fw ui">
+<collection id="pressrv_plat" name="Legacy Presence Services Platform Interfaces" level="ui">
+<component id="presence_list_api" name="Presence List API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/presence_list_api/group"/>
+</component>
+<component id="watcher_info_api" name="Watcher Info API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
+</component>
+<component id="simple_documents_api" name="SIMPLE Documents API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+</component>
+<component id="authorization_api" name="Authorization API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/authorization_api/group"/>
+</component>
+<component id="xdm_protocol_plugin_api" name="XDM Protocol Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+</component>
+<component id="watcher_api" name="Watcher API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/watcher_api/group"/>
+</component>
+<component id="xdm_api" name="XDM API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_api/group"/>
+</component>
+<component id="registration_api" name="Registration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/registration_api/group"/>
+</component>
+<component id="publisher_api" name="Publisher API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/publisher_api/group"/>
+</component>
+<component id="messaging_connection_manager_api" name="Messaging Connection Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
+</component>
+<component id="xdm_settings_api" name="XDM Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
+</component>
+<component id="simple_settings_api" name="SIMPLE Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
+</component>
+<component id="simple_instant_msg_api" name="Simple Instant Msg API" class="api" filter="s60">
+<unit bldFile="/mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+</component>
+</collection>
 <collection id="xdmengine" name="XDM Engine" level="engine">
 <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
 <component id="xdmengine_build" filter="s60" name="XDM Engine Build">
 <unit bldFile="/mw/legacypresence/xdmengine/group"/>
 </component>
 <collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
 <component id="presenceplugin" filter="s60" class="plugin" name="Presence Plugin" introduced="^2">
 <unit bldFile="/mw/legacypresence/simpledatamodeladapter/group"/>
 </component>
 </collection>
-<collection id="legacypresence_info" name="Legacy Presence Services Info" level="ui">
-<component id="pressrv_plat" filter="s60" class="api" name="Legacy Presence Services Platform Interfaces">
-<unit bldFile="/mw/legacypresence/pressrv_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="opensrv" level="specific" tech-domain="pr" name="Open Services" levels="prt lib server eng">
+<collection id="opensrv_plat" name="Open Services Platform Interfaces" level="eng">
+<component id="messagequeue_api" name="Message Queue API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/mw/opensrv/opensrv_plat/messagequeue_api/group"/>
+</component>
+</collection>
 <collection id="loudmouth" name="Loudmouth" level="prt">
 <!-- collection is really a component so it needs to be moved down a directory -->
 <component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
 <unit bldFile="/mw/opensrv/loudmouth/group"/>
 </component>
 <component id="isolationserver_build" filter="s60" name="Isloation Server Build" introduced="^2">
 <!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
 <unit bldFile="/mw/opensrv/isolationserver/group"/>
 </component>
 </collection>
-<collection id="opensrv_info" name="Open Services Info" level="eng">
-<component id="opensrv_plat" filter="s60" name="Open Services Platform Interfaces" class="api" introduced="^2">
-<unit bldFile="/mw/opensrv/opensrv_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="remotemgmt" level="specific" tech-domain="dm" name="Remote Management" levels="plugin framework server generic specific">
+<collection id="remotemgmt_pub" name="Remote Management Public Interfaces" level="specific">
+<component id="synchronization_capability_api" name="Synchronization Capability API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
+</component>
+</collection>
+<collection id="remotemgmt_plat" name="Remote Management Platform Interfaces" level="specific">
+<component id="common_agent_util_and_definitions_api" name="Common Agent util and definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+</component>
+<component id="policy_management_certificate_api" name="Policy Management Certificate API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
+</component>
+<component id="oma_provisioning_adapter_api" name="OMA Provisioning Adapter API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+</component>
+<component id="device_management_parameter_api" name="Device Management Parameter API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
+</component>
+<component id="data_synchronization_plugin_api" name="Data Synchronization Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
+</component>
+<component id="sync_alert_handler_api" name="Sync Alert Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
+</component>
+<component id="syncml_notifier_api" name="SyncML Notifier API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
+</component>
+<component id="syncml_client_api" name="SyncML Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+</component>
+<component id="device_management_plugin_api" name="Device Management plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
+</component>
+<component id="dm_tree_apis" name="DM Tree APIs" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
+</component>
+<component id="terminal_security_device_lock_api" name="Terminal Security Device Lock API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
+</component>
+<component id="policy_management_request_api" name="Policy Management Request API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
+</component>
+<component id="ds_constant_definitions_api" name="DS Constant Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
+</component>
+<component id="scp_server_api" name="SCP Server API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+</component>
+<component id="data_synchronization_notification_api" name="Data Synchronization Notification API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
+</component>
+<component id="oma_provisioning_engine_api" name="OMA Provisioning Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+</component>
+<component id="dm_utils_api" name="DM Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+</component>
+<component id="syncml_alert_api" name="SyncML Alert API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
+</component>
+<component id="obex_client_session_api" name="OBEX Client session API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
+</component>
+<component id="setting_enforcement_info_api" name="Setting Enforcement Info API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+</component>
+<component id="dm_constant_definitions_api" name="DM Constant Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
+</component>
+<component id="oma_ds_extensions_api" name="OMA DS Extensions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
+</component>
+<component id="pnpms_utils_api" name="PNPMS Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
+</component>
+<component id="diagnostics_plugin_utility_api" name="Diagnostics Plugin Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+</component>
+<component id="diagnostics_plugin_api" name="Diagnostics Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
+</component>
+<component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
+</component>
+<component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
+</component>
+<component id="diagnostics_plugin_pool_api" name="Diagnostics Plugin Pool API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+</component>
+<component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
+</component>
+<component id="adaptive_history_list_session_api" name="Adaptive History List Session API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
+</component>
+<component id="fota_engine_api" name="FOTA Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+</component>
+<component id="update_package_storage_plugin_api" name="Update Package Storage Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
+</component>
+<component id="syncml_notifier_roaming_api" name="SyncML Notifier Roaming API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+</component>
+<component id="sync_service_api" name="Sync Service API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
+</component>
+<component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
+</component>
+<component id="dcmo_control_api" name="DCMO Control API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
+</component>
+<component id="ds_capability_mgmt_plugin_api" name="DS Capability Management Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+</component>
+<component id="dm_native_notifier_api" name="DM Native Notifier API" class="api" filter="s60">
+<unit bldFile="/mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
+</component>
+</collection>
 <collection id="policymanagement" name="Policy Management" level="generic">
 <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
 <unit bldFile="/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
 </component>
 <component id="dmutilserver" filter="s60" name="DM Util Server">
 <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
 <!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
 <!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
 </component>
 </collection>
-<collection id="remotemgmt_info" name="Remote Management Info" level="specific">
-<component id="remotemgmt_plat" filter="s60" name="Remote Management Platform Interfaces" class="api">
-<unit bldFile="/mw/remotemgmt/remotemgmt_plat/group"/>
-</component>
-<component id="remotemgmt_pub" filter="s60" name="Remote Management Public Interfaces" class="api">
-<unit bldFile="/mw/remotemgmt/remotemgmt_pub/group"/>
-</component>
-</collection>
 </package>
 <package id="remotestorage" level="generic" tech-domain="de" name="Remote Storage" levels="framework if">
+<collection id="rsfw_plat" name="Remote Storage Platform Interfaces" level="if">
+<component id="rsfw_access_protocol_plugin_api" filter="s60" class="api" name="Remote Storage Framework Access Protocol Plugin API">
+<meta rel="Api"/>
+<unit bldFile="/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+</component>
+</collection>
 <collection id="remotestoragefw" name="Remote Storage Framework" level="framework">
 <component id="mountstore" filter="s60" name="RSFW Mount Store">
 <unit bldFile="/mw/remotestorage/remotestoragefw/mountstore/group"/>
 </component>
 <component id="rsfwnotifierplugins" filter="s60" name="RSFW Notifier Plugins" class="plugin">
 <!-- move exports to other components.
 				This is needed for #includes of configured component until congigiration is in place -->
 <unit bldFile="/mw/remotestorage/remotestoragefw/group"/>
 </component>
 </collection>
-<collection id="remotestorage_info" name="Remote Storage Info" level="if">
-<component id="rsfw_plat" filter="s60" class="api" name="Remote Storage Platform Interfaces">
-<unit bldFile="/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-</component>
-</collection>
 </package>
 <package id="remoteconn" level="generic" tech-domain="de" name="Remote Connectivity" levels="plugin framework server generic specific">
 <collection id="connectivitymodules" name="Connectivity Modules" level="framework">
 <component id="secon" filter="s60" name="Service Controllers">
 <unit bldFile="/mw/remoteconn/connectivitymodules/secon/group"/>
 </component>
 </collection>
 <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
-<component id="remoteconn_plat" filter="s60" name="Remote Connectivity Platform Interfaces" class="api">
-<unit bldFile="/mw/remoteconn/remoteconn_plat/group"/>
-</component>
 <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
 </component>
 </collection>
 <collection id="mtptransports" name="MTP Transports" level="plugin">
 <unit bldFile="/mw/remoteconn/obex/obexextensionapi/group" mrp="/mw/remoteconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
 </component>
 </collection>
 </package>
 <package id="srvdiscovery" level="generic" tech-domain="de" name="Service Discovery and Usage" levels="plugin framework server generic specific">
+<collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
+<component id="upnpstack_plat" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+<meta rel="Api"/>
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
+</component>
+<component id="upnpstack_plat" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+<meta rel="Api"/>
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
+</component>
+<component id="upnpstack_plat" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+<meta rel="Api"/>
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
+</component>
+<component id="upnpstack_plat" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+<meta rel="Api"/>
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_control_point_api/group"/>
+</component>
+<component id="upnpstack_plat" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+<meta rel="Api"/>
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
+</component>
+<component id="upnpstack_plat" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+<meta rel="Api"/>
+<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
+</component>
+</collection>
 <collection id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
 <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
 <unit bldFile="/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="/mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
 </component>
 </collection>
 <collection id="upnp" name="UPnP" level="server">
-<component id="upnpstack_plat" name="UPnP Stack Platform Interfaces" introduced="^3" purpose="optional" class="api">
-<unit bldFile="/mw/srvdiscovery/upnp/upnpstack_plat/group"/>
-</component>
 <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
 <unit bldFile="/mw/srvdiscovery/upnp/upnpstack/group"/>
 </component>
 </collection>
 <collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
 </component>
 </collection>
 </package>
 <package id="dlnasrv" level="specific" tech-domain="de" name="DLNA Services" levels="stack server ctrl framework plugin">
 <!-- uncomment all the units when configuration is in place, they're currently #included from other xxx_build components -->
+<collection id="dlnasrv_plat" name="DLNA Services Platform Interfaces" level="plugin">
+<component id="upnp_media_server_settings_api" name="UPnP Media Server Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
+</component>
+<component id="upnp_av_objects_api" name="UPnP A/V Objects API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
+</component>
+<component id="upnp_media_server_api" name="UPnP Media Server API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
+</component>
+<component id="upnp_security_plugin_api" name="UPnP Security Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
+</component>
+<component id="upnp_avcp_api" name="UPnP AVCP API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
+</component>
+<component id="upnp_media_server_metadata_api" name="UPnP Media Server Metadata API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+</component>
+<component id="upnp_command_api" name="UPnP Command API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+</component>
+<component id="upnp_plugin_api" name="UPnP Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
+</component>
+</collection>
 <collection id="upnpavcontrolpoint" name="UPnP A/V Control Point" level="plugin">
 <component id="avcontrolframework" filter="s60" name="A/V Control Famework" introduced="9.1" deprecated="^3">
 <unit bldFile="/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
 </component>
 <component id="upnpavcontrolpoint_build" filter="s60" name="UPnP A/V Control Point Build" introduced="9.1" deprecated="^3">
 <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
 <!-- <unit bldFile="homemedia/group"/> -->
 </component>
 </collection>
 <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
-<component id="dlnasrv_plat" filter="s60" name="DLNA Services Platform Interfaces" class="api">
-<unit bldFile="/mw/dlnasrv/dlnasrv_plat/group"/>
-</component>
 <component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
 <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
 <unit bldFile="/mw/dlnasrv/group"/>
 </component>
 <component id="dlnasrv_api_test" filter="s60,test,api_test" name="DLNA Services API Tests" purpose="development">
 <unit bldFile="/mw/dlnasrv/tsrc/group"/>
 </component>
 </collection>
 </package>
 <package id="btservices" level="generic" tech-domain="de" name="Bluetooth Services" levels="framework server generic specific plugin">
+<collection id="btservices_pub" name="BT Services Public Interfaces" level="plugin">
+<component id="bluetooth_power_state_api" name="Bluetooth Power State API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
+</component>
+<component id="bluetooth_notifier_api" name="Bluetooth Notifier API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
+</component>
+</collection>
+<collection id="btservices_plat" name="BT Services Platform Interfaces" level="plugin">
+<component id="bluetooth_dosserver_audio_api" name="Bluetooth DOS Server Audio API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
+</component>
+<component id="bluetooth_dut_mode_api" name="Bluetooth DUT Mode API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
+</component>
+<component id="bluetooth_engine_api" name="Bluetooth Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
+</component>
+<component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
+</component>
+<component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
+</component>
+<component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
+</component>
+<component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
+</component>
+<component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
+</component>
+<component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
+</component>
+<component id="bluetooth_local_variation_api" name="Bluetooth Local Variation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
+</component>
+<component id="bluetooth_notifier_internal_api" name="Bluetooth Notifier internal API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
+</component>
+<component id="bluetooth_sap_connection_state_api" name="Bluetooth SAP Connection State API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
+</component>
+<component id="bluetooth_secondary_display_notification_api" name="Bluetooth Secondary Display Notification API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+</component>
+</collection>
 <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
 <component id="bteng" filter="s60" name="Bluetooth Engine">
 <unit bldFile="/mw/btservices/bluetoothengine/bteng/group"/>
 </component>
 <component id="btnotif" filter="s60" name="Bluetooth Notifier">
 <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
 <unit bldFile="/mw/btservices/bluetoothappprofiles/avrcp" mrp="/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
 </component>
 </collection>
 <collection id="btservices_info" name="BT Services Info" level="plugin">
-<component id="btservices_plat" filter="s60" name="BT Services Platform Interfaces" class="api">
-<unit bldFile="/mw/btservices/btservices_plat/group"/>
-</component>
-<component id="btservices_pub" filter="s60" name="BT Services Public Interfaces" class="api">
-<unit bldFile="/mw/btservices/btservices_pub/group"/>
-</component>
 <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
 <unit mrp="/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
 </component>
 <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
 <unit bldFiile="tsrc/group"/>
 </component>
 </collection>
 </package>
 <package id="usbservices" level="generic" tech-domain="de" name="USB Services" levels="framework server generic specific plugin">
+<collection id="usbservices_plat" name="USB Services Platform Interfaces" level="plugin">
+<component id="pictbridge_api" name="PictBridge API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+</component>
+<component id="ptp_responder_api" name="PTP Responder API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+</component>
+<component id="ptp_transport_api" name="PTP Transport API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+</component>
+<component id="usb_device_control_plugin_api" name="USB Device Control Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+</component>
+<component id="usb_notifier_api" name="USB Notifier API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+</component>
+<component id="usb_personality_api_header" name="USB Personality API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+</component>
+<component id="usb_personality_plugin_api" name="USB Personality Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+</component>
+<component id="usb_secondary_display_api" name="USB Secondary Display API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+</component>
+<component id="usb_watcher_api" name="USB Watcher API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+</component>
+<component id="usb_watcher_info_api_header" name="USB Watcher Info API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+</component>
+</collection>
 <collection id="usbservices_info" name="USB Services Info" level="plugin">
-<component id="usbservices_plat" filter="s60" name="USB Services Platform Interfaces" class="api">
-<unit bldFile="/mw/usbservices/usbservices_plat/group"/>
-</component>
 <component id="usbservices_test" filter="s60,test,api_test" name="USB Services Tests">
 <unit bldFile="/mw/usbservices/tsrc/group"/>
 </component>
 </collection>
 <collection id="usbengines" name="USB Engines" level="generic">
 <unit bldFile="/mw/usbservices/usbuis/imageprintuiprovider/group"/>
 </component>
 <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
 <unit bldFile="/mw/usbservices/usbuis/imageprintui/group"/>
 </component>
-<component id="rndisui" filter="s60" name="Remote NDIS UI" introduced="^3">
-<unit bldFile="/mw/usbservices/usbuis/rndisui/group"/>
-</component>
 </collection>
 </package>
 <package id="shortlinkconn" level="generic" tech-domain="de" name="Shortlink Connectivity" levels="framework server generic specific plugin">
 <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+<collection id="shortlinkconn_plat" name="Shortlink Connectivity Platform Interfaces" level="plugin">
+<component id="obex_service_utils_api" name="OBEX Service Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
+</component>
+<component id="obex_service_plugin_api" name="OBEX Service Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
+</component>
+<component id="dialup_connection_status_api" name="Dial-up Connection Status API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
+</component>
+<component id="dun_secondary_display_notification_api" name="DUN Secondary Display Notification API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
+</component>
+<component id="obex_secondary_display_notification_api" name="OBEX Secondary Display Notification API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+</component>
+<component id="generic_hid_api" name="Generic HID API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
+</component>
+<component id="locod_bearer_plugin_api" name="Locod Bearer Plugin API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
+</component>
+<component id="usb_obexservicemanager_client_api" name="USB OBEX Service Manager Client API" class="api" filter="s60">
+<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
+</component>
+</collection>
 <collection id="localconnectivityservice" name="Local Connectivity Service" level="server">
 <component id="locod" name="Local Connectivity Daemon">
 <unit bldFile="/mw/shortlinkconn/localconnectivityservice/locod/group"/>
 </component>
 <component id="obexserviceman" name="OBEX Service Managar">
 </component>
 <component id="headset" name="Headset">
 <unit bldFile="/mw/shortlinkconn/localconnectivityservice/headset/group"/>
 </component>
 </collection>
-<collection id="shortlinkconn_info" name="Shortlink Connectivity Info" level="plugin">
-<component id="shortlinkconn_plat" filter="s60" name="Shortlink Connectivity Platform Interfaces" class="api">
-<unit bldFile="/mw/shortlinkconn/shortlinkconn_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="imghandling" level="specific" tech-domain="mm" name="Image Handling" levels="lib util if">
+<collection id="imagehandling_plat" name="Image Handling Platform Interfaces" level="if">
+<component id="image_handling_library_api" name="Image Handling Library API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+</component>
+<component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+</component>
+<component id="thumbnailmanager_api" name="Thumbnail Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+<unit bldFile="/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group" filter="test,api_test"/>
+</component>
+</collection>
 <collection id="imagehandlinglib" name="Image Handling Library" level="lib">
 <!-- collection is really a component, need to move down a directory -->
 <component id="ihl" filter="s60" name="IHL">
 <unit bldFile="/mw/imghandling/imagehandlinglib/group"/>
 </component>
 <collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
 <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
 <unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
 </component>
 </collection>
-<collection id="imghandling_info" name="Image Handling Info" level="if">
-<component id="imagehandling_plat" filter="s60" name="Image Handling Platform Interfaces" class="api">
-<unit bldFile="/mw/imghandling/imagehandling_plat/group"/>
-</component>
-<component id="imagehandling_api_test" filter="s60,test,api_test" name="Image Handling Platform API Test" purpose="development">
-<unit bldFile="/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/>
-</component>
-</collection>
 </package>
 <package id="metadatasrv" level="specific" tech-domain="mm" name="Legacy Metadata Services" levels="plugin framework server generic specific">
+<collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
+<component id="content_listing_framework_api" name="Content Listing Framework API" class="api" filter="s60">
+<meta rel="config">
+<not-defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/metadatasrv/metadatasrv_pub/content_listing_framework_api/group"/>
+</component>
+<component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
+</component>
+</collection>
+<collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
+<component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
+</component>
+<component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" class="api" filter="s60">
+<meta rel="config">
+<not-defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/metadatasrv/metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
+</component>
+<component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
+<meta rel="config">
+<not-defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/metadatasrv/metadatasrv_plat/content_listing_framework_extended_api/group"/>
+</component>
+</collection>
 <collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
 <component id="mediafetch" filter="s60" name="Media Fetch">
 <unit bldFile="/mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
 </component>
 </collection>
-<collection id="metadatasrv_info" name="Legacy Metadata Services Info" level="specific">
-<component id="metadatasrv_plat" filter="s60" name="Legacy Metadata Services Platform Interfaces" class="api">
-<unit bldFile="/mw/metadatasrv/metadatasrv_plat/group"/>
-</component>
-<component id="metadatasrv_pub" filter="s60" name="Legacy Metadata Services Public Interfaces" class="api">
-<unit bldFile="/mw/metadatasrv/metadatasrv_pub/group"/>
-</component>
-</collection>
 </package>
 <package id="mds" level="specific" tech-domain="mm" name="Metadata Services" levels="mgr eng server int">
+<collection id="mds_plat" name="Metadata Services Platform Interfaces" level="int">
+<component id="context_engine_plugin_api" name="Context Engine Plugin API" introduced="^2" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+<unit bldFile="/mw/mds/mds_plat/context_engine_plugin_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="harvester_framework_api" name="Harvester Framework API" introduced="^2" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+<unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/group" filter="test,api_test"/>
+<!-- can only have one unit with the same filter, #include the following from the previous unit -->
+<unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group" filter="test,api_test"/>
+<unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group" filter="test,api_test"/>
+<unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group" filter="test,api_test"/>
+<unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group" filter="test,api_test"/>
+<unit bldFile="/mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group" filter="test,api_test"/>
+</component>
+<component id="location_manager_api" name="Location Manager API" introduced="^2" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+<unit bldFile="/mw/mds/mds_plat/location_manager_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="metadata_engine_api" name="Metadata Engine API" introduced="^2" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+<unit bldFile="/mw/mds/mds_plat/metadata_engine_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" introduced="^2" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+<unit bldFile="/mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" introduced="^2" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
+</component>
+</collection>
+<collection id="mds_pub" name="Metadata Services Public Interfaces" level="int">
+<component id="content_listing_framework_api" name="Content Listing Framework API" introduced="^2" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="RD_MDS_2_5"/>
+</meta>
+<unit bldFile="/mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+<unit bldFile="/mw/mds/mds_pub/content_listing_framework_api/tsrc/group" filter="test,api_test"/>
+</component>
+</collection>
 <collection id="metadataengine" name="Metadata Engine" level="eng">
 <component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
 <unit bldFile="/mw/mds/metadataengine/common/group"/>
 </component>
 <component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
 <!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
 <!--<unit bldFile="clfwrapper/group"/>-->
 </component>
 </collection>
 <collection id="mds_info" name="Metadata Services Info" level="int">
-<component id="mds_pub" filter="s60" name="Metadata Services Public Interfaces" class="api" introduced="^2">
-<unit bldFile="/mw/mds/mds_pub/group"/>
-</component>
-<component id="mds_plat" filter="s60" name="Metadata Services Platform Interfaces" class="api" introduced="^2">
-<unit bldFile="/mw/mds/mds_plat/group"/>
-</component>
-<component id="mds_api_tests" filter="s60,test,api_test" name="Metadata Services API Tests" purpose="development" introduced="^2">
-<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/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"/>
-<unit bldFile="/mw/mds/mds_pub/content_listing_framework_api/tsrc/group"/>
-</component>
 <component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
 <!-- consider distributiing this into the rest of the components in the package -->
 <unit bldFile="/mw/mds/group"/>
 </component>
 </collection>
 </package>
-<package id="mmuifw" level="specific" tech-domain="mm" name="Multimedia UI Framework" levels="mgr mdl util ui">
+<package id="mmuifw" level="specific" tech-domain="mm" name="Multimedia UI Framework" levels="mgr mdl util ui api">
+<collection id="mmuifw_plat" name="Multimedia UI Framework Platform Interfaces" level="api">
+<component id="alf_widgetfactory_api" name="ALF Widget Factory API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
+</component>
+<component id="alf_widgetutils_api" name="ALF Widget Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
+</component>
+<component id="alf_widgetmodel_api" name="ALF Widget Model API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
+</component>
+<component id="osn_container_api" name="OSN Container API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
+</component>
+<component id="osn_global_api" name="OSN Global API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
+</component>
+<component id="osn_string_api" name="OSN String API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
+</component>
+<component id="alf_resourcepool_api" name="ALF Resource Pool API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
+</component>
+<component id="alf_containerwidget_api" name="ALF Container Widget API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
+</component>
+<component id="alf_viewwidget_api" name="ALF View Widget API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
+</component>
+<component id="alf_scrollbarwidget_api" name="ALF Scrollbar Widget API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
+</component>
+<component id="alf_customlayoutmanagers_api" name="ALF Custom Layout Managers API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
+</component>
+<component id="gesturehelper_api" name="Gesture Helper API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
+</component>
+<component id="mul_coverflowwidget_api" name="MUL Coverflow Widget API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
+</component>
+<component id="mul_datamodel_api" name="MUL Data Model API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
+</component>
+<component id="mul_sliderwidget_api" name="MUL Slider Widget API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
+</component>
+<component id="mul_widget_api" name="MUL Widget API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
+</component>
+</collection>
 <collection id="mmuifw_info" name="Multimedia UI Framework Info" level="ui">
-<component id="mmuifw_plat" filter="s60" name="Multimedia UI Framework Platform Interfaces" class="api">
-<unit bldFile="/mw/mmuifw/mmuifw_plat/group"/>
-</component>
 <component id="mmuifw_build" filter="s60" name="Multimedia UI Framework Build">
 <!-- Move exports into other componetns or remove all #includes and make this a ROM component -->
 <unit bldFile="/mw/mmuifw/group"/>
 </component>
 </collection>
 <unit bldFile="/mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
 </component>
 </collection>
 </package>
 <package id="videoutils" level="specific" tech-domain="mm" name="Video Utils" levels="eng util if">
+<collection id="videoutils_plat" name="Video Utils Platform Interfaces" level="if">
+<component id="videoscheduler_api" name="Video Scheduler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
+</component>
+<component id="videoconnutility_api" name="Video Connection Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
+</component>
+<component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
+</component>
+</collection>
 <collection id="videoscheduler" name="Video Scheduler" level="util">
 <component id="schedulerclient" filter="s60" name="Video Scheduler Client">
 <unit bldFile="/mw/videoutils/videoscheduler/schedulerclient/group"/>
 </component>
 <component id="schedulerserver" filter="s60" name="Video Scheduler Server">
 <component id="video_connutility" filter="s60" name="Video Connection Utility">
 <unit bldFile="/mw/videoutils/videoconnutility/connutility/group"/>
 </component>
 </collection>
 <collection id="videoutils_info" name="Video Utils Info" level="if">
-<component id="videoutils_plat" filter="s60" name="Video Utils Platform Interfaces" class="api">
-<unit bldFile="/mw/videoutils/videoutils_plat/group"/>
-</component>
 <component id="videoutils_test" filter="s60,test,api_test" name="Video Utils Tests">
 <unit bldFile="/mw/videoutils/tsrc/group"/>
 </component>
 </collection>
 </package>
 <package id="mmmw" level="generic" tech-domain="mm" name="Multimedia Middleware" levels="plugin framework server generic specific">
+<collection id="mmmw_plat" name="Multimedia Middleware Platform Interfaces" level="specific">
+<component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+</component>
+<component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+</component>
+<component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+</component>
+<component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+</component>
+<component id="stream_control_custom_command_api" name="Stream Control Custom Command API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+</component>
+<component id="emc_buffer_source_api" name="EMC Buffer Source API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+</component>
+<component id="emc_file_source_api" name="EMC File Source API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+</component>
+<component id="audio_metadata_reader_api" name="Audio MetaData Reader API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+</component>
+<component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+</component>
+<component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+</component>
+<component id="emc_balance_effect_api" name="EMC Balance Effect API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+</component>
+<component id="emc_descriptor_source_api" name="EMC Descriptor Source API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+</component>
+<component id="emc_drm_config_intfc_api" name="EMC DRM Config Intfc API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+</component>
+<component id="voip_audio_services_api" name="VoIP Audio Services" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+</component>
+<component id="configuration_components_factory_api" name="Configuration Components Factory API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+</component>
+<component id="audio_output_control_utility_api" name="Audio Output Control Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+</component>
+<component id="audio_output_control_utility_proxy_api" name="Audio Output Control Utility Proxy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+</component>
+<component id="emc_audio_effects_api" name="EMC Audio Effects API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+</component>
+<component id="call_audio_control_api" name="Call AudioControl API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+</component>
+<component id="radio_utilities_api" name="Radio Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+</component>
+<component id="radio_preset_utilities_api" name="Radio Preset Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+</component>
+<component id="radio_monitor_api" name="Radio Monitor API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+</component>
+<component id="thumbnail_engine_api" name="Thumbnail Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+</component>
+<component id="telephony_multimedia_service_api" name="Telephony Multimedia Service API" class="api" filter="s60">
+<unit bldFile="/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+<unit bldFile="/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/tsrc/group" filter="test,api_test"/>
+</component>
+</collection>
 <collection id="mmfenh" name="MMF Enhancements" level="generic">
 <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
 <unit bldFile="/mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
 </component>
 <component id="audiooutputcontrolutility" filter="s60" name="Audio Output Control Utility">
 </component>
 </collection>
 <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
 <component id="mmmw_test" filter="s60,test,api_test,pref_test" name="Multimedia Middleware Tests" purpose="development">
 <unit bldFile="/mw/mmmw/tsrc/group"/>
-</component>
-<component id="mmmw_api_test" filter="s60,test,api_test" name="Multimedia Middleware API Tests" purpose="development">
-<unit bldFile="/mw/mmmw/mmmw_plat/telephony_multimedia_service_api/tsrc/group"/>
-</component>
-<component id="mmmw_plat" filter="s60" name="Multimedia Middleware Platform Interfaces" class="api">
-<unit bldFile="/mw/mmmw/mmmw_plat/group"/>
 </component>
 <component id="mmmw_metadata" name="Multimedia Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
 </component>
 </collection>
 <unit bldFile="/mw/helix/helix_ren/helix_stub/group"/>
 </component>
 </collection>
 </package>
 <package id="camerasrv" level="specific" tech-domain="mm" name="Camera Services" levels="plugin fw api">
+<collection id="camerasrv_plat" name="Camera Services Platform Interfaces" level="api">
+<component id="media_recorder_sink_api" name="Media Recorder Sink API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+</component>
+<component id="cae_extentension_api" name="CAE Extension API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
+</component>
+<component id="camera_application_engine_api" name="Camera Application Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="custom_onboard_camera_api" name="Custom Onboard Camera API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+</component>
+<component id="imaging_configuration_manager_api" name="Imaging Configuration Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="media_recorder_api" name="Media Recorder API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+</component>
+<component id="asynchronous_file_saving_queue_api" name="Asynchronous File Saving Queue API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
+<unit bldFile="/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group" filter="test,api_test"/>
+</component>
+</collection>
 <collection id="camappengine" name="Camera App Engine" level="fw">
 <!-- is this collection really a component? If so, move down a directory -->
 <component id="stillconverter" filter="s60" name="Still Image Converter">
 <!-- should separate this from parent engine's bld.inf  -->
 <!-- <unit bldFile="camappengine/stillconverter/group"/> -->
 <component id="imagingconfigmanager" filter="s60" name="Imaging Config Manager">
 <unit bldFile="/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
 </component>
 </collection>
 <collection id="camerasrv_info" name="Camera Services Info" level="api">
-<component id="camerasrv_plat" filter="s60" name="Camera Services Platform Interfaces" class="api">
-<unit bldFile="/mw/camerasrv/camerasrv_plat/group"/>
-</component>
-<component id="camerasrv_test" filter="s60,test,api_test" name="Camera Services API Test" purpose="development">
-<!-- #include from a single bld.inf or split into mutliple componens -->
-<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/imaging_configuration_manager_api/tsrc/group"/>
-<unit bldFile="/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/>
-</component>
 <component id="camerasrv_build" filter="s60" name="Camera Services Build">
 <!-- should split into individual bld.infs -->
 <unit bldFile="/mw/camerasrv/group"/>
 </component>
 </collection>
 </package>
 <package id="mmappfw" level="specific" tech-domain="mm" name="Multimedia App Framework" levels="fw utils if">
+<collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
+<component id="inc" name="Inc" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/inc/mmappfwbldvariant.hrh"/>
+</component>
+<component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
+</component>
+<component id="harvester_collection_mediator_api" name="Harvester Collection Mediator API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
+</component>
+<component id="harvester_metadata_extractor_api" name="Harvester Metadata Extractor API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
+</component>
+<component id="harvester_server_api" name="Harvester Server API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
+</component>
+<component id="harvester_utility_api" name="Harvester Utility API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
+</component>
+<component id="playlist_engine_api" name="Playlist Engine API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
+</component>
+<component id="mtp_keys_api" name="MTP Keys API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
+</component>
+<component id="mpx_collection_common_definition_api" name="MPX Collection Common Definition API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
+</component>
+<component id="mpx_collection_utility_api" name="MPX Collection Utility API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+</component>
+<component id="mpx_common_api" name="MPX Common API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
+</component>
+<component id="mpx_common_definition_api" name="MPX Common Definition API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
+</component>
+<component id="mpx_playback_common_definition_api" name="MPX Playback Common Definition API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
+</component>
+<component id="mpx_playback_utility_api" name="MPX Playback Utility API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
+</component>
+<component id="mpx_base_view_plugins_api" name="MPX Base View Plugins API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
+</component>
+<component id="mpx_view_utility_api" name="MPX View Utility API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
+</component>
+<component id="mpx_albumart_utility_api" name="MPX Album Art Utility API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
+</component>
+<component id="media_player_settings_engine_api" name="Media Player Settings Engine API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
+</component>
+<component id="mpx_backstepping_utility_api" name="MPX Backstepping Utility API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="IAD_INCLUDE_BACKSTEPPING"/>
+</meta>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
+</component>
+<component id="asx_parser_api" name="ASX Parser API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="__WINDOWS_MEDIA"/>
+</meta>
+<unit bldFile="/mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
+</component>
+<component id="playback_helper_api" name="Playback Helper API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
+</component>
+<component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
+<unit bldFile="/mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
+</component>
+</collection>
 <collection id="mpx" name="Multimedia Player" level="fw">
 <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
 <unit bldFile="/mw/mmappfw/mpx/commonframework/group"/>
 </component>
 <component id="playbackframework" filter="s60" name="MPX Playback Framework" introduced="^1">
 <unit bldFile="/mw/mmappfw/group"/>
 </component>
 <component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
 <unit bldFile="/mw/mmappfw/tsrc/group" filter="TA_MMAPPFW"/>
 </component>
-<component id="mmappfw_plat" filter="s60" name="Multimedia App Framework Platform Interfaces" class="api" introduced="^1">
-<unit bldFile="/mw/mmappfw/mmappfw_plat/group"/>
-</component>
 </collection>
 </package>
-<package id="inputmethods" level="generic" tech-domain="ui" name="Input Methods" levels="plugin engine framework">
+<package id="inputmethods" level="generic" tech-domain="ui" name="Input Methods" levels="plugin engine framework api">
+<collection id="inputmethods_pub" name="Input Methods Public Interfaces" level="api">
+<component id="ptiengine_iti_api" name="PTI Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
+</component>
+<component id="optical_character_recognition_api" name="Optical Character Recognition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+</component>
+<component id="input_language_info_api" name="Input Language Info API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+</component>
+</collection>
+<collection id="inputmethods_plat" name="Input Methods Platform Interfaces" level="api">
+<component id="pen_input_server_api" name="Pen Input Server API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="ptiengine_hwr_api" name="PTI Engine Handwriting Recognition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="aknfep_settings_api" name="Avkon FEP Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+</component>
+<component id="aknfep_status_api" name="Avkon FEP Status API" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+</component>
+<component id="ptiengine_key_definations_api" name="PTI Engine Key Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
+</meta>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
+</component>
+<component id="aknfep_definitions_api" name="Avkon FEP Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+</component>
+<component id="aknfep_pen_support_api" name="Avkon FEP Pen Support API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+</component>
+<component id="ptiengine_indic_definitions_api" name="PTI Engine Indic Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+</component>
+<component id="aknfep_uiinterface_api" name="Avkon FEP UI Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
+<unit bldFile="/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group" filter="test,api_test"/>
+</component>
+</collection>
 <collection id="textinput" name="Text Input" level="framework">
 <component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
 <meta rel="config">
 <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
 </meta>
 </component>
 <component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
 <unit bldFile="/mw/inputmethods/fep/frontendprocessor/group" mrp="/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
 </component>
 </collection>
-<collection id="inputmethods_info" name="Input Methods Info" level="framework">
+<collection id="inputmethods_info" name="Input Methods Info" level="api">
-<component id="inputmethods_plat" filter="s60" name="Input Methods Platform Interfaces" class="api">
-<unit bldFile="/mw/inputmethods/inputmethods_plat/group"/>
-</component>
-<component id="inputmethods_pub" filter="s60" name="Input Methods Public Interfaces" class="api">
-<unit bldFile="/mw/inputmethods/inputmethods_pub/group"/>
-</component>
-<component id="inputmethods_test" filter="s60,test,api_test" name="Input Methods Tests" introduced="^2" purpose="development">
-<!-- can only have one unit, #include from a single bld.inf -->
-<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/aknfep_uiinterface_api/tsrc/group"/>
-</component>
 <component id="inputmethods_api_tests" filter="s60,test,api_test" name="Input Methods API Tests" introduced="^2" purpose="development">
 <unit bldFile="/mw/inputmethods/tsrc/group"/>
 </component>
 <component id="inputmethods_metadata" name="Input Methods Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="qt" level="generic" tech-domain="ui" name="Qt"/>
 <package id="classicui" level="generic" tech-domain="ui" name="Classic UI" levels="base support server generic specific">
+<collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
+<component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_framework_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/signal_pane_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="japanese_reading_api" name="Japanese Reading API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/japanese_reading_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="global_popup_priority_controller_api" name="Global Popup Priority Controller API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="item_finder_api" name="Item Finder API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/item_finder_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="avkon_fonts_api" name="Avkon Fonts API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_utilities_api" name="Extended Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_utilities_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="personalisation_plugin_api" name="Personalisation Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
+</component>
+<component id="extended_aiw_criteria_api" name="Extended AIW Criteria API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="personalisation_application_api" name="Personalisation Application API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_application_api/group"/>
+</component>
+<component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/volume_popup_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="avkon_secondary_display_support_api" name="AVKON Secondary Display Support API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_setting_pages_api" name="Extended Setting Pages API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_lists_api" name="Extended Lists API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_lists_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="input_block_api" name="Input Block API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/input_block_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="avkon_ui_server_api" name="AVKON UI Server API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="number_grouping_api" name="Number Grouping API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/number_grouping_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_status_pane_api" name="Extended Status Pane API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_notifiers_api" name="Extended Notifiers API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="task_list_api" name="Task List API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/task_list_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="personalisation_slide_show_dialog_api" name="Personalisation Slide Show Dialog API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
+</component>
+<component id="key_event_utilities_api" name="Key Event Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/key_event_utilities_api/group"/>
+</component>
+<component id="emergency_call_support_api" name="Emergency Call Support API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_dialogs_api" name="Extended Dialogs API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_dialogs_api/group"/>
+</component>
+<component id="legacy_ui_framework_headers_api" name="Legacy UI Framework Headers API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
+</component>
+<component id="extended_editors_api" name="Extended Editors API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_editors_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="alarm_api" name="Alarm API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/alarm_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="aiw_service_interface_base_api" name="AIW Service Interface Base API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="list_effects_api" name="List Effects API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/list_effects_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="find_item_ui_api" name="Find Item UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/find_item_ui_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="server_application_services_api" name="Server Application Services API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/server_application_services_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="common_ui_settings_api" name="Common UI Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/common_ui_settings_api/group"/>
+</component>
+<component id="aiw_service_interface_menu_api" name="AIW Service Interface Menu API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="eikon_server_extension_client_api" name="EIKON Server Extension Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="skinnable_clock_api" name="Skinnable Clock API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="battery_pane_api" name="Battery Pane API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/battery_pane_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="fep_document_navigation_api" name="FEP Document Navigation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
+</component>
+<component id="personalisation_localised_texts_api" name="Personalisation Localised Texts API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
+</component>
+<component id="memory_card_ui_api" name="Memory Card UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="avkon_status_api" name="AVKON Status API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_status_api/group"/>
+</component>
+<component id="application_switching_api" name="Application Switching API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/application_switching_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="avkon_localised_texts_api" name="AVKON Localised Texts API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
+</component>
+<component id="avkon_secondary_display_api" name="AVKON Secondary Display API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
+</component>
+<component id="extended_animation_api" name="Extended Animation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_animation_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_notes_api" name="Extended Notes API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_notes_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="screensaver_animation_plugin_definitions_api" name="Screensaver Animation Plugin Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
+</component>
+<component id="text_scroller_api" name="Text Scroller API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/text_scroller_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="custom_cursors_api" name="Custom Cursors API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/custom_cursors_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="screensaver_settings_api" name="Screensaver Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/screensaver_settings_api/group"/>
+</component>
+<component id="global_window_priorities_api" name="Global Window Priorities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/global_window_priorities_api/group"/>
+</component>
+<component id="extended_indicators_api" name="Extended Indicators API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_indicators_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="special_character_table_api" name="Special Character Table API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/special_character_table_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="avkon_settings_api" name="AVKON Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_settings_api/group"/>
+</component>
+<component id="extended_sounds_api" name="Extended Sounds API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_sounds_api/group"/>
+</component>
+<component id="themes_settings_api" name="Themes Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/themes_settings_api/group"/>
+</component>
+<component id="media_shared_document_api" name="Media Shared Document API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/media_shared_document_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_queries_api" name="Extended Queries API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_queries_api/group"/>
+</component>
+<component id="phone_number_text_utilities_api" name="Phone Number Text Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="screensaver_runtime_api" name="Screensaver Runtime API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
+</component>
+<component id="extended_scroller_api" name="Extended Scroller API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_scroller_api/group"/>
+</component>
+<component id="key_rotator_api" name="Key Rotator API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/key_rotator_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_grids_api" name="Extended Grids API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_grids_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="generic_parameter_api" name="Generic Parameter API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/generic_parameter_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="indicator_touch_observer_api" name="Indicator Touch Observer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
+</component>
+<component id="popup_form_api" name="Popup Form API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/popup_form_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="stylus_activated_popup_api" name="Stylus Activated Pop-up API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="indicator_plugin_api" name="Indicator Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="layout_configuration_api" name="Layout Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/layout_configuration_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="common_file_dialogs_filter_factory_api" name="Common File Dialogs Filter Factory API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="avkon_anim_dll_api" name="AVKON Anim DLL API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
+</component>
+<component id="extended_initialization_api" name="Extended Initialization API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_initialization_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="long_tap_animation_api" name="Long Tap Animation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_ui_framework_definitions_api" name="Extended UI Framework Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
+</component>
+<component id="extended_buttons_api" name="Extended Buttons API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_buttons_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="aiw_provider_utility_api" name="AIW Provider Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="transition_effect_parameters_api" name="Transition Effect Parameters API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="extended_input_capabilities_api" name="Extended Input Capabilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="uikon_status_api" name="UIKON Status API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/uikon_status_api/group"/>
+</component>
+<component id="transition_effect_utilities_api" name="Transition Effect Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="pointer_event_modifier_api" name="Pointer Event Modifier API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="avkon_testability_api" name="AVKON Testability API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/avkon_testability_api/group"/>
+</component>
+<component id="ganes_api" name="ganes_api" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/ganes_api/group"/>
+</component>
+<component id="ode_api" name="Ode API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/ode_api/group"/>
+</component>
+<component id="physics_api" name="Physics API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/physics_api/group"/>
+</component>
+<component id="touch_pane_api" name="Touch Pane API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/touch_pane_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="touch_pane_observer_api" name="Touch Pane Observer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+</component>
+<component id="alternate_fs_api" name="Alternate FS API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/alternate_fs_api/group"/>
+</component>
+<component id="discreet_popup_api" name="Discreet Popup API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_plat/discreet_popup_api/group"/>
+</component>
+<component id="touch_gesture_framework_api" name="Touch Gesture Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/touch_gesture_framework_api/group"/>
+<!-- should this be commented out? -->
+<!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
+</component>
+<component id="extended_options_menu_api" name="Extended Options Menu API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_plat/extended_options_menu_api/tsrc/group" filter="test,api_test"/>
+</component>
+</collection>
+<collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
+<component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/input_frame_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="window_server_event_observer_api" name="Window Server Event Observer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="application_framework_api" name="Application Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/application_framework_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="scroller_api" name="Scroller API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/scroller_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="ui_framework_utilities_api" name="UI Framework Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="ui_framework_definitions_api" name="UI Framework Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="buttons_api" name="Buttons API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/buttons_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="queries_api" name="Queries API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/queries_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="aiw_generic_parameter_api" name="AIW Generic Parameter API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="editors_api" name="Editors API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/editors_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="common_file_dialogs_api" name="Common File Dialogs API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="dialog_shutter_api" name="Dialog Shutter API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="fonts_api" name="Fonts API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/fonts_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="screen_clearer_api" name="Screen Clearer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/screen_clearer_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="notifiers_api" name="Notifiers API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/notifiers_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="notes_api" name="Notes API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="screen_saver_api" name="Screen Saver API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/screen_saver_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/status_pane_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="base_controls_api" name="Base Controls API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/base_controls_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="grids_api" name="Grids API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/grids_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="context_pane_api" name="Context Pane API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/context_pane_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="lists_api" name="Lists API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/lists_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="popups_api" name="Popups API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/popups_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="misc_controls_api" name="Misc Controls API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/misc_controls_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="keylock_api" name="Keylock API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/keylock_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="options_menu_api" name="Options Menu API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/options_menu_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="hierarchical_lists_api" name="Hierarchical Lists API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="navigation_pane_api" name="Navigation Pane API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/navigation_pane_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="tabs_api" name="Tabs API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/tabs_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="title_pane_touch_observer_api" name="Title Pane Touch Observer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
+</component>
+<component id="choice_list_api" name="Choice List API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/choice_list_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="info_popup_note_api" name="Info Popup Note API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/info_popup_note_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="setting_pages_api" name="Setting Pages API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/setting_pages_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="screen_mode_api" name="Screen Mode API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/screen_mode_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="indicators_api" name="Indicators API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/indicators_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="error_ui_api" name="Error UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/error_ui_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="animation_api" name="Animation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/animation_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="searchfield_api" name="Searchfield API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/searchfield_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="labels_api" name="Labels API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/labels_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="hotkeys_api" name="Hotkeys API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/hotkeys_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="initialization_api" name="Initialization API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/initialization_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="volume_control_api" name="Volume Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/volume_control_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="title_pane_api" name="Title Pane API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/title_pane_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="sounds_api" name="Sounds API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/sounds_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="aiw_service_handler_api" name="AIW Service Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="aiw_criteria_api" name="AIW Criteria API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="touch_ui_utilities_api" name="Touch UI Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="generic_button_api" name="Generic Button API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/generic_button_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="form_api" name="Form API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/form_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="uikon_core_controls" name="Uikon Core Controls" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/uikon_core_controls/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="calendar_api" name="Calendar API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/calendar_api/group"/>
+</component>
+<component id="toolbar_api" name="Toolbar API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/toolbar_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="server_application_api" name="Server Application API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/server_application_api/group"/>
+</component>
+<component id="slider_api" name="Slider API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/slider_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="private_ui_framework_api" name="Private UI Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="dialogs_api" name="Dialogs API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/dialogs_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="document_handler_api" name="Document handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/document_handler_api/group"/>
+</component>
+<component id="images_api" name="Images API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/images_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="stylus_popup_menu_api" name="Stylus Pop-up Menu API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="information_preview_popup_api" name="Information Preview Popup API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+<unit bldFile="/mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="intermediate_state_api" name="Intermediate State API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/classicui/classicui_pub/intermediate_state_api/group"/>
+</component>
+<component id="help_launcher_api" name="Help Launcher API" class="api" filter="s60">
+<unit bldFile="/mw/classicui/classicui_pub/help_launcher_api/group"/>
+</component>
+</collection>
 <collection id="ode" name="Open Dynamics Engine" level="support">
 <!-- the collection is really a component. Move down a directory.-->
 <component id="ode_build" filter="s60" name="ODE">
 <unit bldFile="/mw/classicui/ode/group"/>
 </component>
 <component id="animation" name="Animation" introduced="9.1" purpose="optional">
 <unit bldFile="/mw/classicui/lafagnosticuifoundation/animation/group" mrp="/mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
 </component>
 </collection>
 <collection id="classicui_info" name="Classic UI Info" level="specific">
-<component id="classicui_pub" filter="s60" name="Classic UI Public Interfaces" class="api">
-<unit bldFile="/mw/classicui/classicui_pub/group"/>
-</component>
-<component id="classicui_plat" filter="s60" name="Classic UI Platform Interfaces" class="api">
-<unit bldFile="/mw/classicui/classicui_plat/group"/>
-</component>
 <!-- the multiple units in the API test components need to be resolved -->
 <component id="classicui_plat_api_test" filter="s60,test,api_test" name="Classic UI Platform API Tests" purpose="development">
 <!-- can only have one unit. Need to #include from a single bld.inf -->
-<unit bldFile="/mw/classicui/tsrc/group" name="classicui_tsrc_all"/>
+<unit bldFile="/mw/classicui/tsrc/group"/>
-<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_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_options_menu_api/tsrc/group"/>
-<unit bldFile="/mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/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/generic_parameter_api/tsrc/group"/>
-<unit bldFile="/mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/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="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/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_gesture_framework_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>
-<component id="classicui_pub_api_test" filter="s60,test,api_test" name="Classic UI Public API Tests" purpose="development">
-<!-- can only have one unit. Need to #include from a single bld.inf -->
-<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/dialog_shutter_api/tsrc/group"/>
-<unit bldFile="/mw/classicui/classicui_pub/dialogs_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/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/info_popup_note_api/tsrc/group"/>
-<unit bldFile="/mw/classicui/classicui_pub/information_preview_popup_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/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/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 id="classicui_metadata" name="Classic UI Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="svgt" level="generic" tech-domain="ui" name="SVG Tiny" levels="util ui">
-<collection id="svgt_info" name="SVG Tiny Info" level="ui">
+<collection id="svgt_plat" name="SVG Tiny Platform Interfaces" level="ui">
-<component id="svgt_plat" filter="s60" name="SVG Tiny Platform Interfaces" class="api" introduced="9.2">
+<component id="svgt_api" name="SVGT API" introduced="9.2" class="api" filter="s60">
-<unit bldFile="/mw/svgt/svgt_plat/group"/>
+<meta rel="Api"/>
+<unit bldFile="/mw/svgt/svgt_plat/svgt_api/group"/>
+</component>
+<component id="nvg_api" name="NVG API" introduced="9.2" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/svgt/svgt_plat/nvg_api/group"/>
 </component>
 </collection>
 <collection id="svgtopt" name="SVG-T Engine" level="util">
 <component id="svgtopt_build" filter="s60" name="SVG Engine" introduced="9.2">
 <!-- component is at collection level. Needs to be moved down a directory -->
 <unit bldFile="/mw/svgt/svgtopt/svgtplugin/group"/>
 </component>
 </collection>
 </package>
 <package id="uiaccelerator" level="generic" tech-domain="ui" name="UI Accelerator" levels="plugin framework server ex if">
-<collection id="uiaccelerator_info" name="UI Accelerator Info" level="if">
+<collection id="uiaccelerator_plat" name="UI Accelerator Platform Interfaces" level="if">
-<component id="uiaccelerator_plat" filter="s60" name="UI Accelerator Platform Interfaces" class="api">
+<component id="alf_core_toolkit_api" name="ALF Core Toolkit API" class="api" filter="s60">
-<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/group"/>
+<meta rel="Api"/>
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
+</component>
+<component id="alf_visual_api" name="ALF Visual API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
+</component>
+<component id="alf_extended_visual_api" name="ALF Extended Visual API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
+</component>
+<component id="alf_extension_api" name="ALF Extension API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
+</component>
+<component id="alf_tracing_api" name="ALF Tracing API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
+</component>
+<component id="alf_client_server_api" name="ALF Client Server API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
 </component>
 </collection>
 <collection id="uiacceltk" name="UI Accelerator Toolkit" level="framework">
 <component id="hitchcock" filter="s60" name="Hitchcock">
 <unit bldFile="/mw/uiaccelerator/uiacceltk/hitchcock/group"/>
 <unit bldFile="/mw/uiaccelerator/uiacceltk/group"/>
 </component>
 </collection>
 </package>
 <package id="uiresources" level="generic" tech-domain="ui" name="UI Resources" levels="compile plugin framework server generic data">
+<!-- are the custom filters below needed? -->
+<collection id="uiresources_pub" name="UI Resources Public Interfaces" level="data">
+<component id="pictograph_api" name="Pictograph API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_pub/pictograph_api/tsrc/group" filter="test,api_test,pictograph_api"/>
+</component>
+<component id="skins_api" name="Skins API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_pub/skins_api/tsrc/group" filter="test,api_test,skins_api"/>
+</component>
+<component id="font_definition_api" name="Font Definition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group" filter="test,api_test,font_definition_api"/>
+</component>
+<component id="graphics_api" name="Graphics API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_pub/graphics_api/tsrc/group" filter="test,api_test,graphics_api"/>
+</component>
+<component id="scalable_icons_api" name="Scalable Icons API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
+</component>
+<component id="layout_id_definitions_api" name="Layout ID Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
+</component>
+</collection>
+<collection id="uiresources_plat" name="UI Resources Platform Interfaces" level="data">
+<component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group" filter="test,api_test,layout_system_private_api"/>
+</component>
+<component id="layout_data_api" name="Layout Data API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group" filter="test,api_test,layout_data_api"/>
+</component>
+<component id="cdl_api" name="CDL API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/cdl_api/tsrc/group" filter="test,api_test,cdl_api"/>
+</component>
+<component id="extended_skins_api" name="Extended Skins API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group" filter="test,api_test,extended_skins_api"/>
+</component>
+<component id="tfx_server_controller_plugin_api" name="TFX Server Controller Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
+</component>
+<component id="extended_fonts_api" name="Extended Fonts API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group" filter="test,api_test,extended_fonts_api"/>
+</component>
+<component id="graphic_configuration_api" name="Graphic Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group" filter="test,api_test,graphic_configuration_api"/>
+</component>
+<component id="mif_header_cdl_api" name="MIF Header CDL API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
+</component>
+<component id="personalisation_and_skins_settings_api" name="Personalisation and Skins Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
+</component>
+<component id="tfx_effect_setup_plugin_api" name="TFX Effect Setup Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+</component>
+<component id="mifconv_definitions_api" name="Mifconv Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
+</component>
+<component id="wallpaper_configuration_api" name="Wallpaper Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
+</component>
+<component id="language_code_definitions_api" name="Language Code Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
+</component>
+<component id="skins_image_attributes_api" name="Skins Image Attributes API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group" filter="test,api_test,skins_image_attributes_api"/>
+</component>
+<component id="private_user_area_code_definitions_api" name="Private User Area Code Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
+</component>
+<component id="tfx_server_plugin_ids_api" name="TFX Server Plug-in IDs API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
+</component>
+</collection>
 <collection id="uiresources_info" name="UI Resources Info" level="data">
-<component id="uiresources_plat" filter="s60" name="UI Resources Platform Interfaces" class="api">
-<unit bldFile="/mw/uiresources/uiresources_plat/group"/>
-</component>
-<component id="uiresources_pub" filter="s60" name="UI Resources Public Interfaces" class="api">
-<unit bldFile="/mw/uiresources/uiresources_pub/group"/>
-</component>
 <component id="uiresources_test" filter="s60,test,api_test" name="UI Resources Tests" purpose="development">
 <unit bldFile="/mw/uiresources/tsrc/group" filter="uiresources_api_all"/>
-</component>
-<!-- are these custom filters needed? -->
-<component id="uiresources_test_pat" filter="s60,test,api_test" name="UI Resources Platform API Tests" purpose="development">
-<!-- can only have one unit. Need to #include from a common one -->
-<unit bldFile="/mw/uiresources/uiresources_plat/cdl_api/tsrc/group" filter="cdl_api"/>
-<unit bldFile="/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group" filter="extended_fonts_api"/>
-<unit bldFile="/mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group" filter="extended_skins_api"/>
-<unit bldFile="/mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group" filter="graphic_configuration_api"/>
-<unit bldFile="/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group" filter="layout_data_api"/>
-<unit bldFile="/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group" filter="layout_system_private_api"/>
-</component>
-<component id="uiresources_test_pat" filter="s60,test,api_test" name="UI Resources Public API Tests" purpose="development">
-<!-- can only have one unit. Need to #include from a common one -->
-<unit bldFile="/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group" filter="skins_image_attributes_api"/>
-<unit bldFile="/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group" filter="font_definition_api"/>
-<unit bldFile="/mw/uiresources/uiresources_pub/graphics_api/tsrc/group" filter="graphics_api"/>
-<unit bldFile="/mw/uiresources/uiresources_pub/pictograph_api/tsrc/group" filter="pictograph_api"/>
-<unit bldFile="/mw/uiresources/uiresources_pub/skins_api/tsrc/group" filter="skins_api"/>
 </component>
 </collection>
 <collection id="uigraphics" name="UI Graphics" level="generic">
 <component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
 <unit bldFile="/mw/uiresources/uigraphics/bitmaps2/group"/>
 <unit bldFile="/mw/uiresources/helpthemes/group"/>
 </component>
 </collection>
 </package>
 <package id="hapticsservices" level="generic" tech-domain="ui" name="Haptics Services" levels="fw server api">
+<collection id="hapticsservices_plat" name="Haptics Services Platform Interfaces" level="api">
+<component id="tacticon_api" name="Tacticon API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+</component>
+<component id="tactile_feedback_core_api" name="Tactile Feedback Core API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+</component>
+<component id="tactile_feedback_server_api" name="Tactile Feedback Server API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+</component>
+</collection>
+<collection id="hapticsservices_pub" name="Haptics Services Public Interfaces" level="api">
+<component id="tactile_feedback_client_api" name="Tactile Feedback Client API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+</component>
+</collection>
 <collection id="tacticonserver" name="Tacticon Server" level="server">
 <!-- collection is really a component. Move down a directory  -->
 <component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
 <unit bldFile="/mw/hapticsservices/tacticonserver/group"/>
 <!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
 <component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
 <!-- consider moving IBY to one fo the above components -->
 <unit bldFile="/mw/hapticsservices/tactilefeedback/group"/>
 </component>
 </collection>
-<collection id="hapticsservices_info" name="Haptics Services Info" level="api">
-<component id="hapticsservices_pub" filter="s60" name="Haptics Services Public Interfaces" class="api" introduced="^1">
-<unit bldFile="/mw/hapticsservices/hapticsservices_pub/group"/>
-</component>
-<component id="hapticsservices_plat" filter="s60" name="Haptics Services Platform Interfaces" class="api" introduced="^1">
-<unit bldFile="/mw/hapticsservices/hapticsservices_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="gsprofilesrv" level="generic" tech-domain="ui" name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+<collection id="gsprofilesrv_pub" name="GS and Profiles Services Public Interfaces" level="specific">
+<component id="profiles_engine_active_profile_settings_api" name="Profiles Engine Active Profile Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+</component>
+<component id="profiles_engine_wrapper_api" name="Profiles Engine Wrapper API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+</component>
+</collection>
+<collection id="gsprofilesrv_plat" name="GS and Profiles Services Platform Interfaces" level="specific">
+<component id="profiles_engine_api" name="Profiles Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
+</component>
+<component id="profiles_mediafilelist_api" name="Media File List API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
+</component>
+<component id="filelist_api" name="File List API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
+</component>
+<component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+</component>
+<component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
+</component>
+<component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
+</component>
+<component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
+</component>
+<component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
+</component>
+<component id="settings_uis_cenrep_collection_api" name="Settings UIs CenRep Collection API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+</component>
+</collection>
 <collection id="gssettingsuis" name="General Settings UIs" level="framework">
 <component id="gs" filter="s60" name="General Settings" introduced="9.2">
 <unit bldFile="/mw/gsprofilesrv/gssettingsuis/gs/group"/>
 </component>
 </collection>
 </component>
 <component id="ringingtone3dplugin" filter="s60" name="Ringing Tone 3D Plugin" class="plugin" introduced="^2">
 <unit bldFile="/mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
 </component>
 </collection>
-<collection id="gsprofilesrv_info" name="GS and Profiles Services Info" level="specific">
-<component id="gsprofilesrv_plat" filter="s60" name="GS and Profiles Services Platform Interfaces" class="api">
-<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_plat/group"/>
-</component>
-<component id="gsprofilesrv_pub" filter="s60" name="GS and Profiles Services Public Interfaces" class="api">
-<unit bldFile="/mw/gsprofilesrv/gsprofilesrv_pub/group"/>
-</component>
-</collection>
 </package>
 <package id="homescreensrv" level="specific" tech-domain="ui" name="Home Screen Services" levels="plugin framework server generic specific">
+<collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
+<component id="ai_content_model_api" name="AI Content Model API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
+</component>
+<component id="ai_utilities_api" name="AI Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/internal/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="ai_plugin_management_api" name="AI Plug-in Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
+</component>
+<component id="ai_plugin_information_api" name="AI Plug-in Information API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
+</component>
+<component id="ai_variation_api" name="AI Variation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
+</component>
+<component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="menu_model_api" name="Menu Model API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
+</component>
+<component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="external_home_screen_api" name="External Home Screen API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
+</component>
+<component id="menu_content_service_api" name="Menu Content Service API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+</component>
+<component id="sapi_backstepping" name="SAPI Backstepping" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
+</component>
+<component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
+</component>
+<component id="sapi_homescreenplugin" name="SAPI Homescreen Plugin" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="sapi_menucontent" name="SAPI Menu Content" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
+</component>
+<component id="xcfw_api" name="XCFW API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
+</component>
+<component id="idlefw_api" name="Idle Framework API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
+</component>
+<component id="hs_widget_publisher_api" name="Home Screen Publishing API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
+</component>
+<component id="context_utility_api" name="UI Context Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/context_utility_api/group"/>
+</component>
+<component id="hs_settings_api" name="HS Settings API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
+</component>
+<component id="hs_content_control_api" name="HS Content Control API" class="api" filter="s60">
+<unit bldFile="/mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
+</component>
+</collection>
 <collection id="xcfw" name="XML Content Framework" level="framework">
 <!-- collection is really a component, needs to be moved down a directory -->
 <component id="xcfw_build" filter="s60" name="XML Content Framework Build">
 <unit bldFile="/mw/homescreensrv/xcfw/group"/>
 </component>
 <unit bldFile="/mw/homescreensrv/backsteppingsrv/group"/>
 </component>
 </collection>
 <collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
 <component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
+<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
 <meta rel="config">
 <defined condition="CONTENT_PUBLISHER_DEBUG"/>
 </meta>
 <!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
 </component>
 <!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
 		If keeping, it need to move down a directory.-->
 <unit bldFile="/mw/homescreensrv/contentcontrolsrv/group"/>
 </component>
 </collection>
-<collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
-<component id="homescreensrv_plat" filter="s60" name="Home Screen Services Platform Interfaces" class="api">
-<unit bldFile="/mw/homescreensrv/homescreensrv_plat/group"/>
-</component>
-<component id="homescreensrv_api_tests" filter="s60,test,api_test" name="Home Screen Services Platform API Tests" purpose="developement">
-<!--  split into components or #include from common bld.inf -->
-<unit bldFile="/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/>
-<unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/>
-<unit bldFile="/mw/homescreensrv/homescreensrv_plat/ai_utilities_api/internal/tsrc/group"/>
-<unit bldFile="/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group"/>
-<unit bldFile="/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/>
-<unit bldFile="/mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/tsrc/group"/>
-</component>
-</collection>
 </package>
 <package id="appinstall" level="generic" tech-domain="rt" name="Application Installation" levels="tool framework generic api">
+<collection id="appinstall_plat" name="Application Installation Platform Interfaces" level="api">
+<component id="iaupdate_api" name="IA Update API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+</component>
+<component id="task_plugin_api" name="Task Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appinstall/appinstall_plat/task_plugin_api/group"/>
+</component>
+<component id="sw_installer_common_ui_api" name="SW Installer Common UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
+</component>
+<component id="sw_installer_launcher_api" name="SW Installer Launcher API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
+</component>
+<component id="task_management_api" name="Task Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appinstall/appinstall_plat/task_management_api/group"/>
+</component>
+<component id="sw_installer_ui_plugin_api" name="SW Installer UI Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
+</component>
+<component id="sw_installer_cr_keys" name="SW Installer CR Keys" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
+</component>
+<component id="sw_installer_ps_keys" name="SW Installer PS Keys" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
+</component>
+<component id="appmngr2runtimeapi" name="Application Manager 2 Runtime Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+</component>
+</collection>
+<collection id="appinstall_pub" name="Application Installation Public Interfaces" level="api">
+<component id="startup_list_management_api" name="Startup List Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
+</component>
+</collection>
 <collection id="ncdengine" name="Nokia Content Discover" level="framework">
 <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
 <component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
 <unit bldFile="/mw/appinstall/ncdengine/engine/group"/>
 </component>
 <component id="swisistools" name="Secure Software Install SIS Tools" purpose="optional" target="desktop">
 <unit bldFile="/mw/appinstall/secureswitools/swisistools/group" mrp="/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
 </component>
 </collection>
 <collection id="appinstall_info" name="Application Installation Info" level="api">
-<component id="appinstall_pub" filter="s60" name="Application Installation Public Interfaces" class="api">
-<unit bldFile="/mw/appinstall/appinstall_pub/group"/>
-</component>
-<component id="appinstall_plat" filter="s60" name="Application Installation Platform Interfaces" class="api">
-<unit bldFile="/mw/appinstall/appinstall_plat/group"/>
-</component>
 <component id="appinstall_test" filter="s60,test,api_test" name="Application Installation Test" purpose="development">
 <unit bldFile="/mw/appinstall/tsrc/group"/>
 </component>
 <component id="appinstall_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="serviceapifw" level="specific" tech-domain="rt" name="Service API Framework" levels="plugin framework server generic specific">
+<collection id="serviceapifw_pub" name="Service API Framework Public Interfaces" level="specific"/>
+<collection id="serviceapifw_plat" name="Service API Framework Platform Interfaces" level="specific">
+<component id="rtsecuritymanager_common_api" name="Runtime Security Manager Common API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+</component>
+<component id="rtsecuritymanager_utility_api" name="Runtime Security Manager Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+</component>
+<component id="rtsecuritymanager_client_api" name="Runtime Security Manager Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+</component>
+<component id="liw_provider_utility_api" name="LIW Provider Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+</component>
+<component id="liw_service_interface_base_api" name="LIW Service Interface Base API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+</component>
+<component id="liw_service_interface_menu_api" name="LIW Service Interface Menu API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+</component>
+<component id="liw_criteria_api" name="LIW Criteria API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+</component>
+<component id="liw_generic_parameter_api" name="LIW Generic Parameter API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+</component>
+<component id="liw_service_handler_api" name="LIW Service Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+</component>
+</collection>
 <collection id="rtsecuritymanager" name="Runtime Security Manager" level="server">
 <component id="rtsecuritymanagerutil" filter="s60" name="Runtime Security Manager Util">
 <unit bldFile="/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
 </component>
 <component id="rtsecuritymanagerserver" filter="s60" name="Runtime Security Manager Server">
 </component>
 </collection>
 <collection id="languageinterworkingfw" name="Language Interworking Framework" level="framework">
 <component id="lifwservicehandler" filter="s60" name="Service Handler">
 <unit bldFile="/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-</component>
-</collection>
-<collection id="serviceapifw_info" name="Service API Framework Info" level="specific">
-<component id="serviceapifw_plat" filter="s60" name="Service API Framework Platform Interfaces" class="api">
-<unit bldFile="/mw/serviceapifw/serviceapifw_plat/group"/>
-</component>
-<component id="serviceapifw_pub" filter="s60" name="Service API Framework Public Interfaces" class="api">
-<unit bldFile="/mw/serviceapifw/serviceapifw_pub/group"/>
 </component>
 </collection>
 </package>
 <package id="serviceapi" level="specific" tech-domain="rt" name="Service API" levels="os mw1 mw2 app">
 <!-- should break up this collection into something meaningful -->
 <unit bldFile="/mw/serviceapi/serviceproviders/group"/>
 </component>
 </collection>
 </package>
 <package id="web" level="specific" tech-domain="rt" name="Web" levels="plugin utils server generic specific">
+<collection id="web_pub" name="Web Public Interfaces" level="specific">
+<component id="browser_control_api" name="Browser Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_pub/browser_control_api/group"/>
+</component>
+<component id="download_mgr_client_api" name="Download Manager Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_pub/download_mgr_client_api/group"/>
+</component>
+<component id="download_mgr_ui_api" name="Download Manager UI Library API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_pub/download_mgr_ui_api/group"/>
+</component>
+<component id="favourites_engine_api" name="Favourites Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_pub/favourites_engine_api/group"/>
+</component>
+<component id="browser_plugin_api" name="Browser Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_pub/browser_plugin_api/group"/>
+</component>
+<component id="settings_api" name="Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_pub/settings_api/group"/>
+</component>
+</collection>
+<collection id="web_plat" name="Web Platform Interfaces" level="specific">
+<component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
+<unit bldFile="/mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh"/>
+</component>
+<component id="aiw_browser_provider_api" name="AIW Browser Provider API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/aiw_browser_provider_api/group"/>
+</component>
+<component id="browser_dialogs_provider_api" name="Browser Dialogs Provider API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/browser_dialogs_provider_api/group"/>
+</component>
+<component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/browser_platform_api/group"/>
+</component>
+<component id="cod_handler_api" name="COD Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/cod_handler_api/group"/>
+</component>
+<component id="connection_manager_api" name="Connection Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/connection_manager_api/group"/>
+</component>
+<component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/cxml_library_api/group"/>
+</component>
+<component id="download_mgr_client_api_extn" name="Download Manager Client API Extension" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/download_mgr_client_api_extn/group"/>
+</component>
+<component id="feeds_engine_api" name="Feeds Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/feeds_engine_api/group"/>
+</component>
+<component id="launcher_api" name="Launcher API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/launcher_api/group"/>
+</component>
+<component id="multipart_parser_api" name="Multipart Parser API" class="api" filter="s60">
+<meta rel="Api"/>
+<meta rel="config">
+<defined condition="BRDO_MULTIPART_PARSER_FF"/>
+</meta>
+<unit bldFile="/mw/web/web_plat/multipart_parser_api/group"/>
+</component>
+<component id="recent_url_store_api" name="Recent URL Store API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/recent_url_store_api/group"/>
+</component>
+<component id="scheme_handler_plugin_api" name="Scheme Handler Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/scheme_handler_plugin_api/group"/>
+</component>
+<component id="scriptable_plugin_api" name="Scriptable Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/scriptable_plugin_api/group"/>
+</component>
+<component id="webutils_api" name="Web Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/webutils_api/group"/>
+</component>
+<component id="widget_registry_api" name="Widget Registry API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/widget_registry_api/group"/>
+</component>
+<component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/xml_parser_api/group"/>
+</component>
+<component id="stmgesturefw_api" name="State Machine Gesture Framework API " class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/web/web_plat/stmgesturefw_api/group"/>
+</component>
+</collection>
 <collection id="web_info" name="Web Info" level="specific">
-<component id="web_plat" filter="s60" name="Web Platform Interfaces" class="api">
-<unit bldFile="/mw/web/web_plat/group"/>
-</component>
-<component id="web_pub" filter="s60" name="Web Public Interfaces" class="api">
-<unit bldFile="/mw/web/web_pub/group"/>
-</component>
 <component id="web_build" filter="s60" name="Web Build">
 <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
 <unit bldFile="/mw/web/group"/>
 </component>
 </collection>
 <unit bldFile="/mw/web/widgets/group"/>
 </component>
 </collection>
 </package>
 <package id="websrv" level="generic" tech-domain="rt" name="Web Services" levels="plugin framework server generic specific">
+<collection id="websrv_pub" name="Web Services Public Interfaces" level="specific">
+<component id="web_service_description_api" name="Web Service Description API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/websrv/websrv_pub/web_service_description_api/group"/>
+</component>
+<component id="web_service_connection_api" name="Web Service Connection API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/websrv/websrv_pub/web_service_connection_api/group"/>
+</component>
+<component id="web_service_manager_api" name="Web Service Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/websrv/websrv_pub/web_service_manager_api/group"/>
+</component>
+<component id="hostlet_connection_api" name="Hostlet Connection API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/websrv/websrv_pub/hostlet_connection_api/group"/>
+</component>
+<component id="web_service_messaging_api" name="Web Service Messaging API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/websrv/websrv_pub/web_service_messaging_api/group"/>
+</component>
+<component id="xml_extensions_api" name="XML Extensions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/websrv/websrv_pub/xml_extensions_api/group"/>
+</component>
+<component id="xml_fragment_api" name="XML Fragment API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/websrv/websrv_pub/xml_fragment_api/group"/>
+</component>
+</collection>
 <collection id="webservices" name="Web Services Framework" level="generic">
 <!-- consider breaking this collection into more meaningful subsets -->
 <component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
 <unit bldFile="/mw/websrv/webservices/wsnotifierplugins/group"/>
 </component>
 <collection id="websrv_info" name="Web Services Info" level="specific">
 <component id="websrv_bld" filter="s60" name="Web Services Build">
 <!-- need to include common .hrh in each unit -->
 <unit bldFile="/mw/websrv/group"/>
 </component>
-<component id="websrv_pub" filter="s60" name="Web Services Public Interfaces" class="api">
-<unit bldFile="/mw/websrv/websrv_pub/group"/>
-</component>
 </collection>
 </package>
 <package id="platformtools" level="generic" tech-domain="to" name="Platform Tools">
 <collection id="gfxconversion" name="Graphics Conversion">
 <component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
 <unit bldFile="/mw/platformtools/gfxconversion/mifconv/group"/>
 </component>
 </collection>
 </package>
 <package id="uitools" level="specific" tech-domain="to" name="UI Tools" levels="compile encode tool if">
+<collection id="uitools_pub" name="UI Tools Public Interfaces" level="if">
+<component id="third_party_bitmap_palette_api" name="Third Party Bitmap Palette API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+</component>
+</collection>
+<collection id="uitools_plat" name="UI Tools Platform Interfaces" level="if">
+<component id="cdl_api" name="CDL API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uitools/uitools_plat/cdl_api/group"/>
+</component>
+<component id="layout_system_private_api" name="Layout System Private API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/mw/uitools/uitools_plat/layout_system_private_api/group"/>
+</component>
+</collection>
 <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
 <!-- collection is actually a component. Needs to be moved down a directory -->
 <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
 <unit bldFile="/mw/uitools/cdlcompilertoolkit/group"/>
 </component>
 <collection id="svgtencoder" name="SVGT Encoder" level="encode">
 <component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
 <unit bldFile="/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
 </component>
 </collection>
-<collection id="uitools_info" name="UI Tools Info" level="if">
-<component id="uitools_plat" filter="s60" name="UI Tools Platform Interfaces" class="api">
-<unit bldFile="/mw/uitools/uitools_plat/group"/>
-</component>
-<component id="uitools_pub" filter="s60" name="UI Tools Public Interfaces" class="api">
-<unit bldFile="/mw/uitools/uitools_pub/group"/>
-</component>
-</collection>
 </package>
 </layer>
 <layer id="app" name="Applications" levels="services apps">
 <package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc apps">
+<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps">
+<component id="location_centre_api" name="Location Centre API" introduced="^3" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/location/loc_plat/location_centre_api/group"/>
+</component>
+</collection>
+<collection id="loc_pub" name="Location Apps Public Interfaces" level="apps">
+<component id="landmarks_ui_selector_api" name="Landmarks UI Selector API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/location/loc_pub/landmarks_ui_selector_api/group"/>
+</component>
+<component id="landmarks_ui_addedit_api" name="Landmarks UI Add/Edit API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/location/loc_pub/landmarks_ui_addedit_api/group"/>
+</component>
+</collection>
 <collection id="basiclocationinfodisplay" name="Basic Location Info Display" level="ui">
 <component id="blid" filter="s60" name="Basic Location Info Display Build">
 <unit bldFile="/app/location/basiclocationinfodisplay/blid/group"/>
 </component>
 </collection>
 <component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
 <!-- consider distributing this into the other components or collapsing into a single component -->
 <unit bldFile="/app/location/locationcentre/group"/>
 </component>
 </collection>
-<collection id="location_info" name="Location Apps Info" level="loc">
-<component id="loc_pub" filter="s60" class="api" name="Location Apps Public Interfaces">
-<unit bldFile="/app/location/loc_pub/group"/>
-</component>
-<component id="loc_plat" filter="s60" class="api" name="Location Apps Platform Interfaces" introduced="^3">
-<unit bldFile="/app/location/loc_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="mmsharinguis" level="services" tech-domain="vc" name="Multimedia Sharing UIs" levels="base plugin if">
+<collection id="mmsharinguis_plat" name="Multimedia Sharing UIs Platform Interfaces" level="if">
+<component id="multimedia_sharing_settings_api" name="Multimedia Sharing Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
+</component>
+<component id="multimedia_sharing_resource_api" name="Multimedia Sharing Resource API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
+</component>
+<component id="multimedia_sharing_manager_api" name="Multimedia Sharing Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
+</component>
+</collection>
 <collection id="mmsharing" name="Multimedia Sharing" level="base">
 <component id="mmshavailability" filter="s60" name="Multimedia Sharing Availability">
 <unit bldFile="/app/mmsharinguis/mmsharing/mmshavailability/group"/>
 </component>
 <component id="mmshindicator" filter="s60" name="Multimedia Sharing Indicator">
 <unit bldFile="/app/mmsharinguis/mmsharing/mmshindicator/group"/>
 </component>
 <!-- consider putting client and server in the same component -->
 <component id="mmshmanagercli" filter="s60" name="Multimedia Sharing Manager Client">
-<unit bldFile="/app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
+<unit bldFile="/app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
+<unit bldFile="/app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group" filter="test,api_test"/>
 </component>
 <component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
 <unit bldFile="/app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
 </component>
 <component id="mmshengine" filter="s60" name="Multimedia Sharing Engine">
 <unit bldFile="/app/mmsharinguis/mmsharing/mmshengine/group"/>
 </component>
 <component id="mmshui" filter="s60" name="Multimedia Sharing UI">
-<!-- can only have one unti: need to #include one from the other if it's needed -->
+<!-- can only have one unit: need to #include one from the other if it's needed -->
 <unit bldFile="/app/mmsharinguis/mmsharing/mmshui/group"/>
 <unit bldFile="/app/mmsharinguis/mmsharing/mmshui/help/group"/>
 </component>
 <component id="mmsharing_build" filter="s60" name="MM Sharing Build">
 <unit bldFile="/app/mmsharinguis/mmsharing/group"/>
 <collection id="mmsharinguis_info" name="Multimedia Sharing UIs Info" level="if">
 <component id="mmsharinguis_build" filter="s60" name="Multimedia Sharing UIs Build">
 <!--  consider distributing to other components -->
 <unit bldFile="/app/mmsharinguis/group"/>
 </component>
-<component id="mmsharinguis_plat" filter="s60" name="Multimedia Sharing UIs Platform Interfaces" class="api">
-<unit bldFile="/app/mmsharinguis/mmsharinguis_plat/group"/>
-</component>
-<component id="mmsharinguis_plat" filter="s60,test,api_test" name="Multimedia Sharing UIs API Tests" class="api">
-<unit bldFile="/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/>
-</component>
 </collection>
 </package>
 <package id="phone" level="apps" span="2" tech-domain="vc" name="Phone Apps" levels="engine plugin ui app">
+<collection id="phone_plat" name="Phone Apps Platform Interfaces" level="app">
+<component id="3d_ringing_tone_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
+</component>
+<component id="telephony_comms_information_api" name="Telephony Comms Information API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/phone/phone_plat/telephony_comms_information_api/group"/>
+</component>
+<component id="telephony_information_api" name="Telephony Information API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/phone/phone_plat/telephony_information_api/group"/>
+</component>
+<component id="telephony_device_mode_api" name="Telephony Device Mode API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/phone/phone_plat/telephony_device_mode_api/group"/>
+</component>
+<component id="telephony_remote_party_information_api" name="Telephony Remote Party Information API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+</component>
+<component id="telephony_video_mailbox_settings_api" name="Telephony Video Mailbox Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
+</component>
+<component id="telephony_configuration_api" name="Telephony Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/phone/phone_plat/telephony_configuration_api/group"/>
+</component>
+<component id="telephony_microphone_mute_status_api" name="Telephony Microphone Mute Status API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
+</component>
+<component id="dialer_keypad_api" name="Dialer Keypad API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/phone/phone_plat/dialer_keypad_api/group"/>
+</component>
+<component id="telephony_logging_extension_api" name="Telephony Logging Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_logging_extension_api/group"/>
+</component>
+<component id="telephony_matching_extension_api" name="Telephony Matching Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_matching_extension_api/group"/>
+</component>
+<component id="telephony_bubble_extension_api" name="Telephony Bubble Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_bubble_extension_api/group"/>
+</component>
+<component id="telephony_menu_extension_api" name="Telephony Menu Extension API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_menu_extension_api/group"/>
+</component>
+<component id="phone_application_commands_api" name="Phone Application Commands API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/phone_application_commands_api/group"/>
+</component>
+<component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/phone_application_voip_commands_api/group"/>
+</component>
+<component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/telephony_mediator_api/group"/>
+</component>
+<component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
+<unit bldFile="/app/phone/phone_plat/video_telephony_mediator_api/group"/>
+</component>
+</collection>
 <collection id="phoneapp" name="Phone Application" level="app">
 <component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
 <unit bldFile="/app/phone/phoneapp/blacklist/group"/>
 </component>
 <component id="phoneui" filter="s60" name="Phone UI">
-<unit bldFile="/app/phone/phoneapp/phoneui/group"/>
+<unit bldFile="/app/phone/phoneapp/phoneui/group" filter="!test"/>
+<unit bldFile="/app/phone/phoneapp/phoneui/tsrc/public/basic/group" filter="test,api_test"/>
 </component>
 <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
 <unit bldFile="/app/phone/phoneapp/phoneuicontrol/group"/>
 </component>
 <component id="phoneuistates" filter="s60" name="Phone UI States">
 <component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
 <unit bldFile="/app/phone/phoneapp/silenceactionplugin/group"/>
 </component>
 <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
 <unit bldFile="/app/phone/phoneapp/phonemediatorcenter/group"/>
-</component>
-<component id="phoneapp_api_test" filter="s60,test,api_test" name="Phone App API Tests">
-<unit bldFile="/app/phone/phoneapp/phoneui/tsrc/public/basic/group"/>
 </component>
 </collection>
 <collection id="phoneengine" name="Phone Engine" level="engine">
 <component id="phonecntfinder" filter="s60" name="Phone Contact Finder">
 <unit bldFile="/app/phone/phoneengine/phonecntfinder/group"/>
 <unit bldFile="/app/phone/phonesettings/pslncallimageplugin/group"/>
 </component>
 </collection>
 <collection id="phoneuis" name="Phone UIs" level="ui">
 <component id="dialer" filter="s60" name="Dialer">
-<unit bldFile="/app/phone/phoneuis/dialer/group"/>
+<unit bldFile="/app/phone/phoneuis/dialer/group" filter="!test"/>
+<unit bldFile="/app/phone/phoneuis/dialer/tsrc/public/basic/group" filter="test,api_test"/>
 </component>
 <component id="easydialing" filter="s60" name="Easy Dialing Plugin" class="plugin" introduced="^3">
 <unit bldFile="/app/phone/phoneuis/easydialing/group"/>
 </component>
 <component id="bubblemanager" filter="s60" name="Phone Bubble Manager">
 <component id="vmbx" filter="s60" name="Voice Mailbox">
 <unit bldFile="/app/phone/phoneuis/vmbx/group"/>
 </component>
 <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
 <unit bldFile="/app/phone/phoneuis/telephonydevicemode/group"/>
-</component>
-<component id="phoneuis_api_test" filter="s60,test,api_test" name="Phone UIs API Tests">
-<unit bldFile="/app/phone/phoneuis/dialer/tsrc/public/basic/group"/>
-</component>
-</collection>
-<collection id="phone_info" name="Phone Apps Info" level="app">
-<component id="phone_plat" filter="s60" name="Phone Apps Platform Interfaces" class="api">
-<unit bldFile="/app/phone/phone_plat/group"/>
 </component>
 </collection>
 <collection id="phoneplugins" name="Phone Plugins" level="plugin">
 <component id="telbranding" filter="s60" name="Tel Branding" class="plugin" introduced="^2">
 <unit bldFile="/app/phone/phoneplugins/telbranding/group"/>
 </component>
 </collection>
 </package>
 <package id="videotelephony" level="apps" tech-domain="vc" name="Video Telephony Apps" levels="engine plugin prot ui">
+<collection id="videotelephony_plat" name="VT Apps Platform Interfaces" level="ui">
+<component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
+</component>
+<component id="video_telephony_media_configuration_api" name="Video Telephony Media Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
+</component>
+</collection>
 <collection id="vtengines" name="Video Telephony Engines" level="engine">
 <component id="videoteleng" filter="s60" name="Video Telephony Engine">
 <unit bldFile="/app/videotelephony/vtengines/videoteleng/Group"/>
 </component>
 <component id="vtmediatorplugin" filter="s60" name="VT Mediator Plugin" class="plugin">
 <!--  this collection is really a component, move down a directory -->
 <component id="videotelproto" filter="s60" name="Video Telephony Protocol">
 <unit bldFile="/app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
 </component>
 </collection>
-<collection id="videotelephony_info" name="VT Apps Info" level="ui">
-<component id="videotelephony_plat" filter="s60" name="VT Apps Platform Interfaces" class="api">
-<unit bldFile="/app/videotelephony/videotelephony_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="iptelephony" level="apps" tech-domain="vc" name="IP Telephony" levels="eng plugin util ui">
+<collection id="iptel_plat" name="IP Telephony Platform Interfaces" level="ui">
+<component id="richcallsettingsengine_api" name="Rich Call Settings Engine API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
+</component>
+<component id="cch_client_api" name="CCH Client API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/cch_client_api/group"/>
+</component>
+<component id="cch_server_api" name="CCH Server API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/cch_server_api/group"/>
+</component>
+<component id="csc_settingsui_api" name="CSC Settings UI API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
+</component>
+<component id="vccpropertyhandler_api" name="VCC Property Handler API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
+</component>
+<component id="vcc_api" name="VCC API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/iptelephony/iptel_plat/vcc_api/group"/>
+</component>
+</collection>
 <collection id="iptelcommsconfig" name="IP Telephony Comms Config" level="ui">
 <component id="cscgsplugin" filter="s60" name="CSC GS Plugin" class="plugin" introduced="^2">
 <unit bldFile="/app/iptelephony/commsconfig/cscgsplugin/group"/>
 </component>
 <component id="cscsipvoipcleanupplugin" filter="s60" name="CSC SIP VoIP Cleanup Plugin" class="plugin" introduced="^2">
 <component id="callcontinuity_build" filter="s60" name="Call Continuity Build" introduced="^2">
 <!--  consider distributing this into the above components -->
 <unit bldFile="/app/iptelephony/callcontinuity/group"/>
 </component>
 </collection>
-<collection id="iptelephony_info" name="IP Telephony Info" level="ui">
-<component id="iptel_plat" filter="s60" class="api" name="IP Telephony Platform Interfaces" introduced="^2">
-<unit bldFile="/app/iptelephony/iptel_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="settingsuis" level="services" tech-domain="dm" name="Settings UIs" levels="rsc ui">
+<collection id="devmngt_plat" name="Settings UIs Platform Interfaces" level="ui">
+<component id="default_app_client_api" name="Default App Client API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/settingsuis/devmngt_plat/default_app_client_api/group"/>
+</component>
+<component id="services_db_api" name="Services DB API" introduced="^1" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
+<unit bldFile="/app/settingsuis/devmngt_plat/services_db_api/tsrc/ServicesDbApiTest/group" filter="test,unit_test"/>
+</component>
+</collection>
 <collection id="defaultapplicationsettings" name="Default Application Settings" level="rsc">
 <component id="services_db" filter="s60" name="Services Database" introduced="^1">
 <unit bldFile="/app/settingsuis/defaultapplicationsettings/services_db/group"/>
 </component>
 <component id="defaultapplicationsettings_server" filter="s60" name="Default Application Server" introduced="^1">
 <collection id="systemswuis" name="System SW UIs" level="ui">
 <component id="touchscreencalib" filter="s60" name="Touchscreen Calibration" introduced="^1">
 <unit bldFile="/app/settingsuis/systemswuis/touchscreencalib/group"/>
 </component>
 </collection>
-<collection id="settingsuis_info" name="Settings UIs Info" level="ui">
-<component id="devmngt_plat" filter="s60" class="api" name="Settings UIs Platform Interfaces" introduced="^1">
-<unit bldFile="/app/settingsuis/devmngt_plat/group"/>
-</component>
-<component id="devmngt_pub" filter="s60" class="api" name="Settings UIs Public Interfaces" introduced="^1">
-<unit bldFile="/app/settingsuis/devmngt_pub/group"/>
-</component>
-<component id="settingsuis_test" filter="s60,test,unit_test" purpose="development" name="Settings UIs Test" introduced="^1">
-<unit bldFile="/app/settingsuis/devmngt_plat/services_db_api/tsrc/ServicesDbApiTest/group" introduced="^1"/>
-</component>
-</collection>
 </package>
 <package id="contentcontrol" level="services" tech-domain="dm" name="Content Control Daemons" levels="plugin app">
+<collection id="contentctrl_plat" name="Content Control Daemons Platforn Interfaces" level="app">
+<component id="oma_ds_presync_plugin_api" name="OMA DS PreSync Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
+</component>
+<component id="ds_agenda_handler_plugin_api" name="DS Agenda Handler Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
+</component>
+<component id="ds_folder_util_api" name="DS Folder Util API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
+</component>
+<component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
+</component>
+<component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
+</collection>
 <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
 <!-- Component at wrong rank, should move down a directory -->
 <component id="dsdcmoadapter_build" filter="s60" name="Data Sync Control DCMO Adapter">
 <unit bldFile="/app/contentcontrol/dsdcmoadapter/group"/>
 </component>
 <component id="omadsappui" filter="s60" name="OMA DS Application UI">
 <unit bldFile="/app/contentcontrol/omads/omadsappui/group"/>
 </component>
 <component id="omadsextensions" filter="s60" name="OMA DS Extensions" class="plugin">
 <unit bldFile="/app/contentcontrol/omads/omadsextensions/group"/>
-</component>
-</collection>
-<collection id="contentcontrol_info" name="Content Control Daemons Info" level="app">
-<component id="contentctrl_plat" filter="s60" class="api" name="Content Control Daemons Platforn Interfaces">
-<unit bldFile="/app/contentcontrol/contentctrl_plat/group"/>
 </component>
 </collection>
 </package>
 <package id="devicecontrol" level="services" tech-domain="dm" name="Device Control Daemons" levels="oma mid app">
 <collection id="devicediagnostics" name="Device Diagnostics" level="app">
 <unit bldFile="/app/printing/imageprint/group"/>
 </component>
 </collection>
 </package>
 <package id="files" level="apps" tech-domain="pr" name="File Manager Apps" levels="support apps">
+<collection id="files_plat" name="File Manager Apps Platform Interfaces" level="apps">
+<component id="memory_scan_popup_ui_api" name="Memory Scan Popup UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/files/files_plat/memory_scan_popup_ui_api/group"/>
+</component>
+</collection>
 <collection id="deviceencryption" name="Device Encryption" level="support">
 <!-- this is either needs to be broken up into idependent bld.infs, or it's really a component and should move down a directory -->
 <component id="devencnotifplugin" filter="s60" name="Device Encryption Notifier Plugin" class="plugin" introduced="^3">
 <unit bldFile="/app/files/deviceencryption/devencnotifplugin/group"/>
 </component>
 <component id="memscaneng" filter="s60" name="Memory Scan Server">
 <unit bldFile="/app/files/filesystemuis/memscaneng/group"/>
 </component>
 <component id="memstatepopup" filter="s60" name="Memory State Popup">
 <unit bldFile="/app/files/filesystemuis/memstatepopup/group"/>
-</component>
-</collection>
-<collection id="files_info" name="File Manager Apps Info" level="apps">
-<component id="files_plat" filter="s60" name="File Manager Apps Platform Interfaces" class="api">
-<unit bldFile="/app/files/files_plat/group"/>
 </component>
 </collection>
 </package>
 <package id="utils" level="apps" tech-domain="pr" name="Utility Apps" levels="app">
 <collection id="extras" name="Extras" level="app">
 <unit bldFile="/app/utils/extras/converter/group"/>
 </component>
 </collection>
 </package>
 <package id="contacts" level="apps" span="2" tech-domain="pr" name="Contacts Apps" levels="engine support services ui">
+<collection id="contacts_pub" name="Contacts Apps Public Interfaces" level="ui">
+<component id="phonebook_fetch_ui_api" name="Phonebook Fetch UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
+</component>
+<component id="phonebook_data_management_api" name="Phonebook Data Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_pub/phonebook_data_management_api/group"/>
+</component>
+<component id="phonebook_vcard_importexport_api" name="Phonebook vCard Import/Export API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
+</component>
+<component id="phonebook_data_addedit_ui_api" name="Phonebook Data Add/Edit UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
+</component>
+<component id="phonebook_ui_utilities_api" name="Phonebook UI Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
+</component>
+<component id="phonebook_thumbnail_operation_api" name="Phonebook Thumbnail Operation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
+</component>
+<component id="speed_dial_utility_control_api" name="Speed Dial Utility Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
+</component>
+</collection>
+<collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
+<component id="virtual_phonebook_store_api" name="Virtual Phonebook Store API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_store_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="virtual_phonebook_sim_services_api" name="Virtual Phonebook SIM Services API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="virtual_phonebook_configuration_api" name="Virtual Phonebook Configuration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
+</component>
+<component id="virtual_phonebook_copy_policy_api" name="Virtual Phonebook Copy Policy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
+</component>
+<component id="virtual_phonebook_policy_api" name="Virtual Phonebook Policy API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_policy_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="virtual_phonebook_engine_api" name="Virtual Phonebook Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_engine_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_engine_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="virtual_phonebook_migration_support_api" name="Virtual Phonebook Migration Support API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
+</component>
+<component id="virtual_phonebook_view_definition_api" name="Virtual Phonebook View Definition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="virtual_phonebook_vcard_api" name="Virtual Phonebook vCard API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_vcard_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="cms_contactor_api" name="CMS Contactor API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/cms_contactor_api/group"/>
+</component>
+<component id="contactpresence_api" name="Contact Presence API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/contactpresence_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/contactpresence_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="presence_cache_api" name="Presence Cache API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/presence_cache_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/presence_cache_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="phonebook_internal_common_api" name="Phonebook Internal Common API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
+</component>
+<component id="phonebook_internal_appfw_api" name="Phonebook Internal App Framework API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
+</component>
+<component id="phonebook_internal_data_management_api" name="Phonebook Internal Data Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
+</component>
+<component id="phonebook_2_xsp_extension_manager_api" name="Phonebook 2 xSP Extension Manager API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
+</component>
+<component id="phonebook_ui_controls_api" name="Phonebook UI Controls API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
+</component>
+<component id="phonebook_2_image_management_api" name="Phonebook 2 Image Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
+</component>
+<component id="phonebook_extension_api" name="Phonebook Extension API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_extension_api/group"/>
+</component>
+<component id="phonebook_public_constants_api" name="Phonebook Public Constants API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
+</component>
+<component id="phonebook_internal_ui_utilities_api" name="Phonebook Internal UI Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
+</component>
+<component id="logs_engine_api_extensions" name="Logs Engine API Extensions" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
+</component>
+<component id="phonebook_thumbnails_api" name="Phonebook Thumbnails API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
+</component>
+<component id="phonebook_2_icon_api" name="Phonebook 2 Icon API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
+</component>
+<component id="phonebook_engine_extension_api" name="Phonebook Engine Extension API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
+</component>
+<component id="phonebook_2_store_configuration_management_api" name="Phonebook 2 Store Configuration Management API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
+</component>
+<component id="logs_ui_command_line_api" name="Logs UI Command Line API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
+</component>
+<component id="speed_dial_dialogs_api" name="Speed Dial Dialogs API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
+</component>
+<component id="phonebook_2_xsp_view_activation_api" name="Phonebook 2 xSP View Activation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
+</component>
+<component id="logs_timers_api" name="Logs Timers API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/logs_timers_api/group"/>
+</component>
+<component id="phonebook_2_ui_extension_definition_api" name="Phonebook 2 UI Extension Definition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
+</component>
+<component id="phonebook_2_common_ui_api" name="Phonebook 2 Common UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
+</component>
+<component id="phonebook_2_ui_extension_api" name="Phonebook 2 UI Extension API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
+</component>
+<component id="phonebook_2_store_property_api" name="Phonebook 2 Store Property API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
+</component>
+<component id="phonebook_2_ui_extension_plugin_api" name="Phonebook 2 UI Extension Plug-In API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
+</component>
+<component id="phonebook_2_ui_controls_api" name="Phonebook 2 UI Controls API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
+</component>
+<component id="phonebook_2_thin_ui_extension_plugin_api" name="Phonebook 2 Thin UI Extension Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
+</component>
+<component id="phonebook_2_commands_api" name="Phonebook 2 Commands API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
+</component>
+<component id="phonebook_2_presentation_api" name="Phonebook 2 Presentation API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
+</component>
+<component id="phonebook_2_ui_utilities_api" name="Phonebook 2 UI Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
+</component>
+<component id="phonebook_2_contact_related_icon_customization_api" name="Phonebook 2 Contact Related Icon Customization API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_contact_related_icon_customization_api/group"/>
+</component>
+<component id="cca_launch_api" name="CCA Launch API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/cca_launch_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/cca_launch_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="cca_view_plugin_api" name="CCA View Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/cca_view_plugin_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="predictivesearch_client_api" name="Predictive Search Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/predictivesearch_client_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/predictivesearch_client_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="predictivesearch_utils_api" name="Predictive Search Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/predictivesearch_utils_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="predictivesearch_adapters_api" name="Predictive Search Adapters API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
+</component>
+<component id="predictivesearch_algorithm_api" name="Predictive Search Algorithm API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
+</component>
+<component id="phonebook_2_rcl_api" name="Phonebook 2 RCL API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_rcl_api/group" fitler="!test"/>
+<unit bldFile="/app/contacts/contacts_plat/phonebook_2_rcl_api/tsrc/group" filter="test,api_test"/>
+</component>
+</collection>
 <collection id="contactextensions" name="Contacts Extensions" level="services">
 <component id="predefinedcontacts" filter="s60" name="Predefined Contacts">
 <unit bldFile="/app/contacts/contactextensions/predefinedcontacts/group"/>
 </component>
 </collection>
 <!-- need to remove #includes from bld.inf and rename as Predictive Search ROM -->
 <unit bldFile="/app/contacts/predictivesearch/group"/>
 </component>
 </collection>
 <collection id="contacts_info" name="Contacts Apps Info" level="ui">
-<component id="contacts_plat" filter="s60" name="Contacts Apps Platform Interfaces" class="api">
-<unit bldFile="/app/contacts/contacts_plat/group"/>
-</component>
-<component id="contacts_plat_test" filter="s60,test,api_test" name="Contacts Apps Platform API Test">
-<!-- can only have one unit. Use common bld.inf? -->
-<unit bldFile="/app/contacts/contacts_plat/cca_launch_api/tsrc/group"/>
-<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/presence_cache_api/tsrc/group"/>
-<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group"/>
-<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group"/>
-<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group"/>
-<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"/>
-<unit bldFile="/app/contacts/contacts_plat/virtual_phonebook_engine_api/tsrc/group"/>
-<unit bldFile="/app/contacts/contacts_plat/predictivesearch_client_api/tsrc/group"/>
-<unit bldFile="/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/>
-<unit bldFile="/app/contacts/contacts_plat/phonebook_2_rcl_api/tsrc/group"/>
-</component>
-<component id="contacts_pub" filter="s60" name="Contacts Apps Public Interfaces" class="api">
-<unit bldFile="/app/contacts/contacts_pub/group"/>
-</component>
 <component id="contacts_metadata" name="Contacts Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="organizer" level="apps" span="2" tech-domain="pr" name="Organizer Application Suite" levels="support services engine ui app">
+<collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
+<component id="meeting_request_mailbox_utilities_api" name="Meeting Request Mailbox Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
+</component>
+<component id="meeting_request_uids_api" name="Meeting Request UIDs API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/meeting_request_uids_api/group"/>
+</component>
+<component id="calendar_exporter_api" name="Calendar Exporter API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/calendar_exporter_api/group"/>
+</component>
+<component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/agenda_versit_2_api/group"/>
+</component>
+<component id="calendar_importer_api" name="Calendar Importer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/calendar_importer_api/group"/>
+</component>
+<component id="calendar_launcher_api" name="Calendar Launcher API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/calendar_launcher_api/group"/>
+</component>
+<component id="calendar_common_utils_api" name="Calendar Common Utils API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/calendar_common_utils_api/group"/>
+</component>
+<component id="searchfw_launcher_api" name="Search Framework Launcher API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/searchfw_launcher_api/group"/>
+</component>
+<component id="alarm_const_api" name="Alarm Const API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/alarm_const_api/group"/>
+</component>
+<component id="alarm_ui_external_control_api" name="Alarm UI External Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
+</component>
+<component id="calendar_settings_keys_api" name="Calendar Settings Keys API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
+</component>
+<component id="calendar_tones_settings_keys_api" name="Calendar Tones Settings Keys API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
+</component>
+<component id="clock_settings_api" name="Clock Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/clock_settings_api/group"/>
+</component>
+<component id="common_alarm_editor_api" name="Common Alarm Editor API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/common_alarm_editor_api/group"/>
+</component>
+<component id="alarm_ui_secondary_display_api" name="Alarm UI Secondary Display API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
+</component>
+<component id="searchui_launcher_api" name="Search UI Launcher API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/searchui_launcher_api/group"/>
+</component>
+<component id="agenda_entry_ui_api" name="Agenda Entry UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
+</component>
+<component id="meeting_request_utillities_api" name="Meeting Request Utillities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
+</component>
+<component id="meeting_request_viewer_api" name="Meeting Request Viewer API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
+</component>
+<component id="calendar_custamization_api" name="Calendar Customization API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_plat/calendar_custamization_api/group"/>
+</component>
+</collection>
+<collection id="organizer_pub" name="Organizer Application Suite Public Interfaces" level="app">
+<component id="calendar_interim_utils2_api" name="Calendar Interim Utils 2 API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
+</component>
+<component id="notepad_library_api" name="Notepad Library API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/organizer/organizer_pub/notepad_library_api/group"/>
+</component>
+</collection>
 <collection id="alarmengines" name="Alarm Engines" level="engine">
 <component id="missedalarmstore" filter="s60" name="Missed Alarm Store">
 <unit bldFile="/app/organizer/alarmengines/missedalarmstore/group"/>
 </component>
 </collection>
 <component id="chinesecalendarconverter" name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
 <unit bldFile="/app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="/app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
 </component>
 </collection>
 <collection id="organizer_info" name="Organizer Application Suite Info" level="app">
-<component id="organizer_pub" filter="s60" name="Organizer Application Suite Public Interfaces" class="api">
-<unit bldFile="/app/organizer/organizer_pub/group"/>
-</component>
-<component id="organizer_plat" filter="s60" name="Organizer Application Suite Platform Interfaces" class="api">
-<unit bldFile="/app/organizer/organizer_plat/group"/>
-</component>
 <component id="organizer_metadata" name="Organizer Application Suite Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="messaging" level="apps" span="2" tech-domain="pr" name="Messaging Apps" levels="mail eng base ui">
+<collection id="msg_pub" name="Messaging Apps Public APIs" level="ui">
+<component id="messaging_integration_api" name="Messaging Integration API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_pub/messaging_integration_api/group"/>
+</component>
+<component id="plugin_bio_control_api" name="Plug-in Bio Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_pub/plugin_bio_control_api/group"/>
+</component>
+<component id="mms_client_mtm_api" name="MMS Client MTM API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_pub/mms_client_mtm_api/group"/>
+</component>
+<component id="open_new_message_notification_api" name="Open New Message Notification API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_pub/open_new_message_notification_api/group"/>
+</component>
+<component id="messaging_editor_constants_api" name="Messaging Editor Constants API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_pub/messaging_editor_constants_api/group"/>
+</component>
+</collection>
+<collection id="msg_plat" name="Messaging Apps Platform APIs" level="ui">
+<component id="smil_player_launch_api" name="SMIL Player Launch API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/smil_player_launch_api/group"/>
+</component>
+<component id="messaging_media_resolver_api" name="Messaging Media Resolver API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/messaging_media_resolver_api/group"/>
+</component>
+<component id="smil_engine_api" name="SMIL Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/smil_engine_api/group"/>
+</component>
+<component id="mms_server_settings_api" name="MMS Server Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/mms_server_settings_api/group"/>
+</component>
+<component id="new_contacts_note_secondary_display_api" name="New Contacts Note Secondary Display API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
+</component>
+<component id="messaging_center_ui_utilities_api" name="Messaging Center UI Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
+</component>
+<component id="internet_mail_mtm_ui_api" name="Internet Mail MTM UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
+</component>
+<component id="messaging_editor_api" name="Messaging Editor API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/messaging_editor_api/group"/>
+</component>
+<component id="email_domain_utilities_api" name="Email Domain Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/email_domain_utilities_api/group"/>
+</component>
+<component id="smil_transition_api" name="SMIL Transition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/smil_transition_api/group"/>
+</component>
+<component id="new_contacts_note_status_api" name="New Contacts Note Status API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/new_contacts_note_status_api/group"/>
+</component>
+<component id="unified_editor_video_conversion_api" name="Unified Editor Video Conversion API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
+</component>
+<component id="mms_conformance_api" name="MMS Conformance API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/mms_conformance_api/group"/>
+</component>
+<component id="new_contacts_note_variables_api" name="New Contacts Note Variables API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
+</component>
+<component id="new_message_notification_api" name="New Message Notification API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/new_message_notification_api/group"/>
+</component>
+<component id="mms_application_api" name="MMS Application API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/mms_application_api/group"/>
+</component>
+<component id="mms_engine_settings_api" name="MMS Engine Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/mms_engine_settings_api/group"/>
+</component>
+<component id="mms_codec_client_api" name="MMS Codec Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/mms_codec_client_api/group"/>
+</component>
+<component id="send_ui_meeting_request_api" name="Send UI Meeting Request API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
+</component>
+<component id="new_contact_notes_extended_api" name="New Contact Notes Extended API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
+</component>
+<component id="mail_ui_constants_api" name="Mail UI Constants API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/mail_ui_constants_api/group"/>
+</component>
+<component id="sim_dialog_launch_api" name="SIM Dialog Launch API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/messaging/msg_plat/sim_dialog_launch_api/group"/>
+</component>
+</collection>
 <collection id="mobilemessaging" name="Mobile Messaging" level="ui">
 <component id="audiomsg" filter="s60" name="Audio Message">
 <unit bldFile="/app/messaging/mobilemessaging/audiomsg/group"/>
 </component>
 <component id="msgmedia" filter="s60" name="Message Media">
 <component id="imap4mtm" name="IMAP4 MTM" introduced="9.2" purpose="optional" class="plugin" deprecated="^3">
 <unit bldFile="/app/messaging/email/imap4mtm/group" mrp="/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
 </component>
 </collection>
 <collection id="messaging_info" name="Messaging Apps Info" level="ui">
-<component id="msg_plat" name="Messaging Apps Platform APIs" filter="s60" class="api">
-<unit bldFile="/app/messaging/msg_plat/group"/>
-</component>
-<component id="msg_pub" name="Messaging Apps Public APIs" filter="s60" class="api">
-<unit bldFile="/app/messaging/msg_pub/group"/>
-</component>
 <component id="messaging_metadata" name="Messaging Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
 <unit mrp="/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
 </component>
 </collection>
 </package>
 <package id="commonemail" level="apps" span="2" tech-domain="pr" name="Email Apps" levels="service support ui app">
+<collection id="email_pub" name="Email Apps Public Interfaces" level="app">
+<component id="email_widget_api" name="Email Widget API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/commonemail/email_pub/email_widget_api/group"/>
+</component>
+</collection>
+<collection id="email_plat" name="Email Apps Platform Interfaces" level="app">
+<component id="email_client_api" name="Email Client API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/commonemail/email_plat/email_client_api/group"/>
+</component>
+<component id="email_setup_plugin_api" name="Email Setup Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/commonemail/email_plat/email_setup_plugin_api/group"/>
+</component>
+<component id="email_crkeys_api" name="Email CenRep Keys API" class="api" filter="s60">
+<unit bldFile="/app/commonemail/email_plat/email_crkeys_api/group"/>
+</component>
+</collection>
 <collection id="emailservices" name="Email Services" level="service">
 <component id="emailframework" filter="s60" name="Email Framework" introduced="^2">
 <unit bldFile="/app/commonemail/emailservices/emailframework/group"/>
 </component>
 <component id="emailclientapi" filter="s60" name="Email Client API" introduced="^2">
 </component>
 <component id="commonemail_help" filter="s60" name="Email Help" introduced="^2">
 <!-- should this be commented out or not? -->
 <!-- <unit bldFile="help/group"/> -->
 </component>
-<component id="email_plat" filter="s60" class="api" name="Email Apps Platform Interfaces">
-<unit bldFile="/app/commonemail/email_plat/group"/>
-</component>
-<component id="email_pub" filter="s60" class="api" name="Email Apps Public Interfaces">
-<unit bldFile="/app/commonemail/email_pub/group"/>
-</component>
 </collection>
 </package>
 <package id="conversations" level="apps" tech-domain="pr" name="Conversation Apps" levels="settings utils plugin ui">
+<collection id="conversations_plat" name="Conversation Apps Platform Interfaces" level="ui">
+<component id="im_cv_launcher_api" name="IM CV Launcher API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/conversations/conversations_plat/im_cv_launcher_api/group"/>
+</component>
+<component id="im_connection_api" name="IM Connection API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/conversations/conversations_plat/im_connection_api/group"/>
+</component>
+<component id="im_cv_appui_api" name="IM CV App UI API" class="api" filter="s60">
+<unit bldFile="/app/conversations/conversations_plat/im_cv_appui_api/group"/>
+</component>
+</collection>
 <collection id="uiservicetabsettings" name="UI Service Tab Settings" level="settings">
 <!-- this is really at the wrong rank. should move down a directory -->
 <component id="vimpstsettings" filter="s60" name="VIMP Service Tab Settings">
 <unit bldFile="/app/conversations/uiservicetabsettings/group"/>
 </component>
 <component id="imstatuspaneindicatorplugin_build" filter="s60" name="IM Status Pane Indicator Plugin Build" class="plugin" introduced="^3">
 <unit bldFile="/app/conversations/imstatuspaneindicatorplugin/group"/>
 </component>
 </collection>
 <collection id="conversations_info" name="Conversation Apps Info" level="ui">
-<component id="conversations_plat" filter="s60" name="Conversation Apps Platform Interfaces" class="api">
-<unit bldFile="/app/conversations/conversations_plat/group"/>
-</component>
 <component id="conversations_build" filter="s60" name="Conversation Apps Build">
 <!-- can the exports be moved to other components? or this remade into a configuration component?-->
 <unit bldFile="/app/conversations/group"/>
 </component>
 </collection>
 </package>
 <package id="im" level="apps" tech-domain="pr" name="Instant Messaging Apps" levels="support prot engine apps">
+<collection id="im_plat" name="Instant Messaging Apps Platform Interfaces" level="apps">
+<component id="wv_sap_settings_api" name="WV SAP Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/im/im_plat/wv_sap_settings_api/group"/>
+</component>
+</collection>
 <collection id="wvsettings20" name="Wireless Village Settings Engine" level="support">
 <!-- this is really a component. should move down a directory -->
 <component id="wvsapsettingsstore" name="WV SAP Settings Store" filter="s60" introduced="9.3">
 <unit bldFile="/app/im/wvsettings20/group"/>
 </component>
 </collection>
-<collection id="im_info" name="Instant Messaging Apps Info" level="apps">
-<component id="im_plat" filter="s60" name="Instant Messaging Apps Platform Interfaces" class="api">
-<unit bldFile="/app/im/im_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="dictionary" level="services" tech-domain="pr" name="Dictionary" levels="utils ui">
+<collection id="dictionary_plat" name="Dictionary Platform Interfaces" level="ui">
+<component id="menu_suites_macros_api" name="Menu Suites Macros API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
+</component>
+</collection>
 <collection id="userdict" name="User Dictionary" level="ui">
 <!-- collection is really a component, move down a dir -->
 <component id="userdict_build" filter="s60" name="Japanese User Dictionary">
 <unit bldFile="/app/dictionary/userdict/group"/>
 </component>
 </collection>
-<collection id="dictionary_info" name="Dictionary Info" level="ui">
-<component id="dictionary_plat" filter="s60" name="Dictionary Platform Interfaces" class="api">
-<unit bldFile="/app/dictionary/dictionary_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="camera" level="apps" tech-domain="ma" name="Camera Apps">
+<collection id="camera_plat" name="Camera Apps Platform Interfaces">
+<component id="camcorder_ui_constants_api" name="Camcorder UI Constants API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/camera/camera_plat/camcorder_ui_constants_api/group"/>
+</component>
+<component id="active_palette_2_api" name="Active Palette 2 API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/camera/camera_plat/active_palette_2_api/group"/>
+</component>
+</collection>
 <collection id="camerauis" name="Camera UIs">
 <component id="activepalette" filter="s60" name="Active Palette">
 <unit bldFile="/app/camera/camerauis/activepalette/group"/>
 </component>
 <component id="cameraapp" filter="s60" name="Camera Application">
 <unit bldFile="/app/camera/camerauis/cameraapp/group"/>
 <unit bldFile="/app/camera/camerauis/cameraapp/help/group"/>
 </component>
 </collection>
 <collection id="camera_info" name="Camera Apps Info">
-<component id="camera_plat" filter="s60" name="Camera Apps Platform Interfaces" class="api">
-<unit bldFile="/app/camera/camera_plat/group"/>
-</component>
 <component id="camera_plat_test" filter="s60,test,api_test" name="Camera Apps Platform API Tests" purpose="development">
 <!-- can only have one unit. #include from a single bld.inf? -->
 <unit bldFile="/app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/>
 <unit bldFile="/app/camera/camera_plat/active_palette_2_api/tsrc/group"/>
 </component>
 </collection>
 </package>
 <package id="imgeditor" level="apps" tech-domain="ma" name="Image Editor Apps" levels="engine ui">
+<collection id="imgeditor_plat" name="Image Editor Apps Platform Interfaces" level="ui">
+<component id="image_editor_debug_utilities_api" name="Image Editor Debug Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
+</component>
+<component id="image_editor_utilities_api" name="Image Editor Utilities API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
+</component>
+<component id="image_editor_definitions_api" name="Image Editor Definitions API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
+</component>
+<component id="image_editor_system_parameters_api" name="Image Editor System Parameters API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
+</component>
+<component id="image_processing_engine_api" name="Image Processing Engine API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
+</component>
+</collection>
 <collection id="imageeditor" name="Image Editor UI" level="ui">
 <component id="pb" filter="s60" name="Plugin Base">
 <unit bldFile="/app/imgeditor/imageeditor/pb/group"/>
 </component>
 <component id="iepb" filter="s60" name="Image Editor Plugin Base">
 <component id="imageeditorengine_build" filter="s60" name="Image Editor Engine Build">
 <!-- should distribute this to the other components -->
 <unit bldFile="/app/imgeditor/imageeditorengine/group"/>
 </component>
 </collection>
-<collection id="imgeditor_info" name="Image Editor Apps Info" level="ui">
-<component id="imgeditor_plat" filter="s60" name="Image Editor Apps Platform Interfaces" class="api">
-<unit bldFile="/app/imgeditor/imgeditor_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor Apps" levels="engine ui">
+<collection id="videoeditor_plat" filter="s60" name="Video Editor Apps Platform Interfaces" level="ui">
+<component id="video_editor_engine_api" name="Video Editor Engine API" class="api" introduced="^2">
+<meta rel="Api"/>
+<unit bldFile="/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
+</component>
+</collection>
 <collection id="videditor" name="Video Editor" level="ui">
 <component id="videoeditorcommon" filter="s60" name="Video Editor Common" introduced="^2">
 <unit bldFile="/app/videoeditor/videditor/videoeditorcommon/group"/>
 </component>
 <component id="videoeditoruicomponents" filter="s60" name="Video Editor UI Components" introduced="^2">
 <component id="videoeditorengine_build" filter="s60" name="Video Editor Engine Build" introduced="^2">
 <!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
 <unit bldFile="/app/videoeditor/videoeditorengine/group"/>
 </component>
 </collection>
-<collection id="videoeditor_info" name="Video Editor Apps Info" level="ui">
-<component id="videoeditor_plat" filter="s60" name="Video Editor Apps Platform Interfaces" class="api" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditor_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
+<collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
+<component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
+<unit bldFile="/app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
+<unit bldFile="/app/videoplayer/videoplayer_plat/videoplayer_startup_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="video_player_file_details_dialog_api" name="Media Player File Details Dialog API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
+<unit bldFile="/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/tsrc/group" filter="test,api_test"/>
+</component>
+<component id="videocollection_api" name="Video Collection API" class="api" filter="s60">
+<unit bldFile="/app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+</component>
+</collection>
 <collection id="videofeeds" name="Video Feeds" level="util">
 <component id="iptv_utils" filter="s60" name="IPTV Util" introduced="^3">
 <unit bldFile="/app/videoplayer/videofeeds/utils/group"/>
 </component>
 <component id="viewmessageutility" filter="s60" name="View Message Utility" introduced="^3">
 <collection id="videoplayerapp" name="Video Player App" level="apps">
 <component id="lwplayer" name="Lightweight Player" filter="s60">
 <unit bldFile="/app/videoplayer/videoplayerapp/lwplayer/group"/>
 </component>
 <component id="mpxvideoplayer" filter="s60" name="MPX Video Player" class="plugin">
-<unit bldFile="/app/videoplayer/videoplayerapp/mpxvideoplayer/group"/>
+<unit bldFile="/app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
+<unit bldFile="/app/videoplayer/videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/group" filter="test,unit_test"/>
 </component>
 <component id="videoplayerlauncher" filter="s60" name="Video Player Launcher">
 <unit bldFile="/app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
 </component>
 </collection>
 <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
 <component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
-<unit bldFile="/app/videoplayer/videoplayback/videohelix/group"/>
+<unit bldFile="/app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
+<unit bldFile="/app/videoplayer/videoplayback/videohelix/tsrc/ut_videohelixtest/group" filter="test,unit_test"/>
 </component>
 <component id="videopdlplaybackviewplugin" filter="s60" name="Video PDL Playback View Plugin" class="plugin" introduced="^3">
-<unit bldFile="/app/videoplayer/videoplayback/videopdlplaybackviewplugin/group"/>
+<unit bldFile="/app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
 </component>
 <component id="videoplaybackcontrols" filter="s60" name="Video Playback Controls" introduced="^3" class="plugin">
-<unit bldFile="/app/videoplayer/videoplayback/videoplaybackcontrols/group"/>
+<unit bldFile="/app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
+<unit bldFile="/app/videoplayer/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group" filter="test,unit_test"/>
 </component>
 <component id="videoplaybackviewplugin" filter="s60" name="Video Playback View Plugin" class="plugin" introduced="^3">
 <unit bldFile="/app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
 </component>
 <component id="videoplaybackviews" filter="s60" name="Video Playback Views" class="plugin" introduced="^3">
-<unit bldFile="/app/videoplayer/videoplayback/videoplaybackviews/group"/>
+<unit bldFile="/app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
-</component>
+<unit bldFile="/app/videoplayer/videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group" filter="test,unit_test"/>
-<component id="videoplayer_tsrc" name="Video Player Tests" filter="s60,test,unit_test" introduced="^3" purpose="development">
-<!--  can only have one unit. Can these be #included from any of the above. Why is a videoplayerapp test in here?-->
-<unit bldFile="/app/videoplayer/videoplayback/videohelix/tsrc/ut_videohelixtest/group"/>
-<unit bldFile="/app/videoplayer/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group"/>
-<unit bldFile="/app/videoplayer/videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group"/>
-<unit bldFile="/app/videoplayer/videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/group"/>
-</component>
-</collection>
-<collection id="videoplayer_info" name="Video Player Apps Info" level="apps">
-<component id="videoplayer_plat" filter="s60" name="Video Player Apps Platform Interfaces" class="api">
-<unit bldFile="/app/videoplayer/videoplayer_plat/group"/>
-</component>
-<component id="videoplayer_api_test" filter="s60,test,api_test" purpose="development" name="Video Player API Test">
-<!--  can only have one unit, #include from a common bld.inf? -->
-<unit bldFile="/app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/tsrc/group"/>
-<unit bldFile="/app/videoplayer/videoplayer_plat/videoplayer_startup_api/tsrc/group"/>
 </component>
 </collection>
 </package>
 <package id="photos" level="apps" tech-domain="ma" name="Photos" levels="support fw ui app">
+<collection id="photos_plat" name="Photos Platform Interfaces" level="app">
+<component id="collection_plugins_api" name="Collection Plugins API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/photos/photos_plat/collection_plugins_api/group"/>
+</component>
+<component id="controllers_collection_api" name="Controllers Collection API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/photos/photos_plat/controllers_collection_api/group"/>
+</component>
+<component id="gallery_utilities_api" name="Gallery Utilities API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/photos/photos_plat/gallery_utilities_api/group"/>
+</component>
+<component id="slideshow_ui_constants_api" name="Slideshow Ui Constants API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/photos/photos_plat/slideshow_ui_constants_api/group"/>
+</component>
+<component id="views_metadatadialog_api" name="Views Metadata Dialog API" introduced="^2" class="api" filter="s60">
+<unit bldFile="/app/photos/photos_plat/views_metadatadialog_api/group"/>
+</component>
+</collection>
 <collection id="photosgallery" name="Photos Gallery" level="app">
 <!-- consider splitting this collection into the application itself, and the frameworks behind it -->
 <component id="photosgallery_help" filter="s60" name="Photos Help" introduced="^2">
 <unit bldFile="/app/photos/photosgallery/help/group"/>
 </component>
 <component id="photosgallery_build" filter="s60" name="Photos Gallery Build" introduced="^2">
 <!--  need to remove the #included above bld.infs from this  -->
 <unit bldFile="/app/photos/photosgallery/group"/>
 </component>
 </collection>
-<collection id="photos_info" name="Photos Info" level="app">
-<component id="photos_plat" filter="s60" name="Photos Platform Interfaces" class="api" introduced="^2">
-<unit bldFile="/app/photos/photos_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="musicplayer" level="apps" tech-domain="ma" name="Music Player Apps" levels="plugins support hs app">
+<collection id="musicplayer_plat" name="Music Player Apps Platform Interfaces" level="app">
+<component id="mpx_music_player_app_api" name="MPX Music Player App API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
+</component>
+<component id="mpx_music_player_commonui_api" name="MPX Music Player Common UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
+</component>
+<component id="mpx_music_player_media_key_handler_api" name="MPX Music Player Media Key Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
+</component>
+<component id="mpx_music_player_remote_control_api" name="MPX Music Player Remote Control API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
+</component>
+<component id="mpx_music_shop_ui_api" name="MPX Music Shop UI API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
+</component>
+<component id="mpx_music_wap_adapter_cenrep_api" name="MPX Music Wap Adapter CenRep API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
+</component>
+<component id="mpx_music_store_api" name="MPX Music Store Find API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
+</component>
+<component id="audio_application_features_api" name="Audio Application Features API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
+</component>
+<component id="music_content_publisher_plugin_api" name="Music Content Publisher Plugin API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
+</component>
+</collection>
 <collection id="mpxmusicplayer" name="MPX Music Player" level="app">
 <component id="mpxmusicplayer_help" filter="s60" name="Help">
 <unit bldFile="/app/musicplayer/mpxmusicplayer/help/group"/>
 </component>
 <component id="mpxmusicplayer_commonui" filter="s60" name="MPX Common UI">
 <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
 <component id="musicplayer_build" filter="s60" name="Music Player Build">
 <!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
 <unit bldFile="/app/musicplayer/group"/>
 </component>
-<component id="musicplayer_plat" filter="s60" name="Music Player Apps Platform Interfaces" class="api">
-<unit bldFile="/app/musicplayer/musicplayer_plat/group"/>
-</component>
 <component id="musicplayer_test" filter="s60,test,pref_test,api_test" purpose="development" name="Music Player Apps Test">
 <unit bldFile="/app/musicplayer/tsrc/group"/>
 </component>
 </collection>
 </package>
 </package>
 <package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps"/>
 <package id="tv" level="services" tech-domain="ma" name="TV Apps"/>
 <package id="voicerec" level="apps" tech-domain="ma" name="Voice Recorder Apps">
 <!-- custom filter pref_test-->
+<collection id="voicerec_plat" name="Voice Recorder Apps Platform Interfaces">
+<component id="new_file_service_api" name="New File Service API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/voicerec/voicerec_plat/new_file_service_api/group"/>
+</component>
+<component id="voicerecorder_public_constants_api" name="Voice Recorder Public Constants API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
+</component>
+</collection>
 <collection id="voicerecorder" name="Voice Recorder">
 <!--this is really a component, move down a directory -->
 <component id="voicerecorder_build" filter="s60" name="Voice Recorder Build">
 <unit bldFile="/app/voicerec/voicerecorder/group"/>
 </component>
 </collection>
 <collection id="voicerec_info" name="Voice Recorder Apps Info">
 <component id="voicerec_api_test" filter="s60,test,api_test,pref_test" purpose="development" name="Voice Recorder Apps Test">
 <unit bldFile="/app/voicerec/tsrc/group"/>
-</component>
-<component id="voicerec_plat" filter="s60" name="Voice Recorder Apps Platform Interfaces" class="api">
-<unit bldFile="/app/voicerec/voicerec_plat/group"/>
 </component>
 </collection>
 </package>
 <package id="screensaver" level="apps" tech-domain="ui" name="Screen Saver Apps" levels="plugin ui">
 <!-- is this a user-facing application or a daemon? -->
 <unit bldFile="/app/screensaver/group"/>
 </component>
 </collection>
 </package>
 <package id="homescreen" level="apps" tech-domain="ui" name="Home Screen Apps" levels="fw support apps">
+<collection id="homescreen_plat" name="Home Screen Apps Platform Interfaces" level="apps">
+<component id="menu_settings_api" name="Menu Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/homescreen/homescreen_plat/menu_settings_api/group"/>
+</component>
+<component id="hs_content_control_ui" name="HS Content Control Ui" class="api" filter="s60">
+<unit bldFile="/app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
+</component>
+<component id="hs_renderingplugin_api" name="HS Rendering Plugin API" class="api" filter="s60">
+<unit bldFile="/app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
+</component>
+</collection>
 <collection id="idlehomescreen" name="Idle Home Screen" level="apps">
 <component id="nativeuicontroller" filter="s60" name="Native UI Controller">
 <unit bldFile="/app/homescreen/idlehomescreen/nativeuicontroller/group"/>
 </component>
 <component id="exths" filter="s60" name="Active Idle Container" class="plugin">
 </component>
 <component id="taskswitcherui" filter="s60" name="Task Switcher UI" introduced="^3">
 <unit bldFile="/app/homescreen/taskswitcher/taskswitcherui/group"/>
 </component>
 </collection>
-<collection id="homescreen_info" name="Home Screen Apps Info" level="apps">
-<component id="homescreen_plat" filter="s60" name="Home Screen Apps Platform Interfaces" class="api">
-<unit bldFile="/app/homescreen/homescreen_plat/group"/>
-</component>
-</collection>
 </package>
 <package id="graphicsuis" level="services" tech-domain="ui" name="Graphics UIs" levels="util ui">
-<collection id="graphicsuis_info" name="Graphics UIs Info" level="ui">
+<collection id="graphicsuis_plat" name="Graphics UIs Platform Interfaces" level="ui">
-<component id="graphicsuis_plat" filter="s60" name="Graphics UIs Platform Interfaces" class="api">
+<component id="svgt_viewer_ui_api" name="SVG-T Viewer UI API" class="api" filter="s60">
-<unit bldFile="/app/graphicsuis/graphicsuis_plat/group"/>
+<meta rel="Api"/>
+<unit bldFile="/app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
+</component>
+<component id="svg_application_observer_utility_api" name="SVG Application Observer Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
+</component>
+<component id="svgt_file_view_details_dialog_api" name="SVG-T File View Details Dialog API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
 </component>
 </collection>
 <collection id="svgtviewer" name="SVG-T Viewer" level="ui">
 <component id="svgtviewerplugin" filter="s60" name="SVG-T Viewer Plugin">
 <unit bldFile="/app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
 </component>
 </collection>
 </package>
 <package id="profile" level="apps" tech-domain="ui" name="Profiles" levels="app">
+<collection id="profile_plat" name="Profiles Platform Interfaces" level="app">
+<component id="profiles_settings_view_api" name="Profiles Settings View API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/profile/profile_plat/profiles_settings_view_api/group"/>
+</component>
+</collection>
 <collection id="profilesapplication" name="Profiles Application" level="app">
 <component id="profiles" filter="s60" name="Profiles">
 <unit bldFile="/app/profile/profilesapplication/profiles/group"/>
 </component>
 <component id="profilesapplication_test" filter="s60,test,api_test" purpose="development" name="Profiles Application Test">
 <unit bldFile="/app/profile/profilesapplication/tsrc/public/basic/group"/>
 </component>
 </collection>
 <collection id="profile_info" name="Profiles Info" level="app">
-<component id="profile_plat" filter="s60" name="Profiles Platform Interfaces" class="api">
-<unit bldFile="/app/profile/profile_plat/group"/>
-</component>
 <component id="profile_help" filter="s60" name="Profiles Help">
 <unit bldFile="/app/profile/help/group"/>
 </component>
 </collection>
 </package>
 <package id="speechsrv" level="services" tech-domain="ui" name="Speech Recognition UIs" levels="engine framework ui">
+<collection id="speechsrv_plat" name="Speech Recognition UIs Platform Interfaces" level="ui">
+<component id="vas_api" name="VAS API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/vas_api/group"/>
+</component>
+<component id="nss_devasr_api" name="NSS DevASR API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
+</component>
+<component id="tts_hw_device_api" name="TTS HW Device API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
+</component>
+<component id="voice_commands_resource_header_api" name="Voice Commands Resource Header API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
+</component>
+<component id="nss_mmf_tts_custom_commands_api" name="NSS MMF TTS Custom Commands API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
+</component>
+<component id="srsf_cenrep_settings_api" name="SRSF CenRep Settings API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
+</component>
+<component id="voice_ui_plugin_api" name="Voice UI Plug-in API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
+</component>
+<component id="nss_tts_utility_api" name="NSS TTS Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
+</component>
+<component id="nss_srs_custom_commands_api" name="NSS SRS Custom Commands API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
+</component>
+<component id="srsf_secondarydisplay_api" name="SRSF Secondary Display API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
+</component>
+<component id="asrs_hw_device_api" name="ASRS Hardware Device API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
+</component>
+<component id="vas_vcommand_api" name="VAS Voice Command API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
+</component>
+<component id="adaptation_hw_device_api" name="Adaptation Hardware Device API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
+</component>
+<component id="nss_devtts_api" name="NSS DevTTS API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
+</component>
+<component id="nss_srs_utility_api" name="NSS SRS Utility API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
+</component>
+<component id="recognition_hw_device_api" name="Recognition Hardware Device API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
+</component>
+<component id="vas_contact_handler_api" name="VAS Contact Handler API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
+</component>
+<component id="nlp_hw_device" name="NLP Hardware Device" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
+</component>
+<component id="nss_si_speech_recognition_data_api" name="NSS SI Speech Recognition Data API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
+</component>
+<component id="nss_tts_common_api" name="NSS TTS Common API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
+</component>
+<component id="grcompiler_hw_device_api" name="Grammar Compiler Hardware Device API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
+</component>
+<component id="ttp_hw_device_api" name="TTP Hardware Device API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
+</component>
+<component id="vocman_hw_device_api" name="VocMan Hardware Device API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
+</component>
+<component id="speech_synthesis_clientserver_api" name="Speech Synthesis Client-Server API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
+</component>
+<component id="voice_ui_accessory_button_handling_api" name="Voice UI Accessory Button Handling API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
+</component>
+<component id="ui_voice_recognition_api" name="UI Voice Recognition API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
+</component>
+<component id="vcommand_settings_cenrep_api" name="Voice Command Settings CenRep API" class="api" filter="s60">
+<meta rel="Api"/>
+<unit bldFile="/app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
+</component>
+</collection>
 <collection id="voiceui" name="Voice UI" level="ui">
 <component id="vcommand" filter="s60" name="Voice Commands UI" introduced="^1">
 <unit bldFile="/app/speechsrv/voiceui/vcommand/group"/>
 </component>
 <component id="voiceuivoicerecognition" filter="s60" name="Voice UI Recognition" introduced="^1">
 </component>
 </collection>
 <collection id="speechsrv_info" name="Speech Recognition UIs Info" level="ui">
 <component id="speechsrv_test" filter="s60,test,unit_test" purpose="development" name="Speech Recognition UIs Test">
 <unit bldFile="/app/speechsrv/tsrc/group"/>
-</component>
-<component id="speechsrv_plat" filter="s60" name="Speech Recognition UIs Platform Interfaces" class="api">
-<unit bldFile="/app/speechsrv/speechsrv_plat/group"/>
 </component>
 </collection>
 </package>
 <package id="homescreentools" level="services" tech-domain="ui" name="Home Screen Tools" levels="tool install">
 <collection id="dtdinstaller" name="DTD Installer" level="install">
 <unit bldFile="/app/webuis/pushmtm/group"/>
 </component>
 </collection>
 </package>
 <package id="jrt" level="services" tech-domain="rt" name="Java Runtime" levels="util generic rt ui">
+<collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
+<component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_registry_api/build"/>
+</component>
+<component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_env_info_api/build"/>
+</component>
+<component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
+<unit bldFile="/app/jrt/jrt_plat/java_debug_api/build"/>
+</component>
+</collection>
 <collection id="java_stubs" name="Java Stubs" level="util">
 <meta rel="config">
 <defined condition="__JAVA_STUBS"/>
 </meta>
 <!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
 <!-- Remove the #includes and rename JRT ROM-->
 <!--<unit bldFile="java_stubs/group"/>-->
 </component>
 </collection>
 <collection id="jrt_info" name="JRT Info" level="rt">
-<component id="jrt_plat" filter="s60" name="JRT Platform Interfaces" class="api">
-<unit bldFile="/app/jrt/jrt_plat/group"/>
-</component>
 <component id="jrt_build" filter="s60" name="JRT Build">
 <!--  needed for __JAVA_STUBS condition -->
-<unit bldFile="/app/jrt/java_stubs/group"/>
+<unit bldFile="/app/jrt/group"/>
 </component>
 </collection>
 </package>
 <package id="conntools" level="services" tech-domain="dc" name="Connectivity Tools" levels="config app">
 <collection id="nettools" name="Net Tools" level="app">

changeset 446	b73548d05e72
parent 442	2c616067053f
child 449	321a53705efc