Revised system model with the *_pub and *_plat components split out into separate bld.infs
authorWilliam Roberts <williamr@symbian.org>
Fri, 19 Mar 2010 14:46:47 +0000
changeset 446 b73548d05e72
parent 445 731411a3cd2a
child 447 5f8bd9894161
Revised system model with the *_pub and *_plat components split out into separate bld.infs
symbian3/single/sysdefs/full_system_model_3.0.xml
symbian3/single/sysdefs/sf3.svg
symbian3/single/sysdefs/sf3c.svg
symbian3/single/sysdefs/sf3lit.svg
symbian3/single/sysdefs/sf3pkg.svg
symbian3/single/sysdefs/system_model.xml
symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Thu Mar 18 11:43:11 2010 +0000
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Fri Mar 19 14:46:47 2010 +0000
@@ -64,7 +64,7 @@
    <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">
@@ -258,6 +258,367 @@
     </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"/>
@@ -276,19 +637,24 @@
     </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">
@@ -361,6 +727,9 @@
      <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">
@@ -376,13 +745,7 @@
     <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"/>
-     </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"/>
+      <unit bldFile="/os/ossrv/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"/>
@@ -441,6 +804,257 @@
     </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"/>
@@ -628,14 +1242,6 @@
      </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>
@@ -662,10 +1268,12 @@
      <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">
-      <!-- remove test filter once cafstreamingsupport is available -->
+     <component id="referencedrmagent" name="Reference DRM Agent" introduced="8.0" purpose="development">
       <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">
@@ -715,6 +1323,10 @@
      <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>
@@ -1064,6 +1676,74 @@
     </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"/>
@@ -1091,12 +1771,6 @@
      </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>
@@ -1113,11 +1787,6 @@
       <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"/>
@@ -1229,6 +1898,20 @@
     </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"/>
@@ -1305,15 +1988,17 @@
      </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>
@@ -1329,15 +2014,332 @@
      </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"/>
@@ -1436,12 +2438,6 @@
      </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>
@@ -1578,6 +2574,40 @@
     </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"/>
@@ -1595,20 +2625,6 @@
       <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">
@@ -1662,11 +2678,13 @@
       <unit bldFile="/os/graphics/graphicstest/uibench/group" mrp="/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
      </component>
     </collection>
-    <collection id="graphics_info" name="Graphics Info" level="app-if">
+    <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"/>
-      <!-- cope with missing graphics_plat/group -->
-     </component>
+     </component>
+    </collection>
+    <collection id="graphics_info" name="Graphics Info" level="app-if">
      <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
       <unit mrp="/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
      </component>
@@ -1767,6 +2785,26 @@
     </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"/>
@@ -1845,18 +2883,32 @@
      </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"/>
@@ -1895,9 +2947,6 @@
      </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>
@@ -2069,6 +3118,7 @@
     </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">
@@ -2090,6 +3140,7 @@
     </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">
@@ -2128,10 +3179,6 @@
      </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>
@@ -2140,6 +3187,138 @@
   </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 -->
@@ -2283,7 +3462,7 @@
      <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>
@@ -2330,18 +3509,81 @@
      </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">
@@ -2459,9 +3701,6 @@
      </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>
@@ -2471,6 +3710,84 @@
     </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">
@@ -2519,18 +3836,127 @@
      </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"/>
@@ -2615,16 +4041,66 @@
       <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 -->
@@ -2648,13 +4124,91 @@
       <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"/>
@@ -2739,12 +4293,6 @@
      </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"/>
@@ -2752,6 +4300,20 @@
     </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"/>
@@ -2819,15 +4381,22 @@
      </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"/>
@@ -2868,15 +4437,30 @@
      </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-->
@@ -2919,14 +4503,15 @@
       <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"/>
@@ -3046,12 +4631,35 @@
       <!-- 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">
@@ -3085,9 +4693,6 @@
      </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"/>
@@ -3098,6 +4703,163 @@
     </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"/>
@@ -3215,24 +4977,41 @@
      </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">
@@ -3294,18 +5073,117 @@
      </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">
@@ -3338,13 +5216,61 @@
       <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">
@@ -3392,13 +5318,13 @@
       <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">
@@ -3429,13 +5355,165 @@
       <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"/>
@@ -3540,16 +5618,14 @@
       <!--<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"/>
@@ -3589,11 +5665,6 @@
       <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">
@@ -3602,9 +5673,6 @@
      </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>
@@ -3654,15 +5722,38 @@
     </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>
@@ -3675,6 +5766,40 @@
    </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"/>
@@ -3866,9 +5991,6 @@
      </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"/>
@@ -3879,6 +6001,70 @@
     </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"/>
@@ -3920,12 +6106,6 @@
      </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>
@@ -3935,10 +6115,49 @@
     </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>
@@ -4000,13 +6219,41 @@
      <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"/>
@@ -4042,13 +6289,23 @@
       <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">
@@ -4063,31 +6320,98 @@
       <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"/>
@@ -4174,36 +6498,80 @@
      </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"/>
@@ -4265,6 +6633,20 @@
     </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"/>
@@ -4282,15 +6664,109 @@
      </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"/>
@@ -4351,12 +6827,6 @@
      <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>
@@ -4371,6 +6841,44 @@
     </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">
@@ -4400,16 +6908,6 @@
      </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"/>
@@ -4417,6 +6915,99 @@
     </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"/>
@@ -4488,12 +7079,73 @@
      <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">
+    </collection>
+   </package>
+   <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">
@@ -4578,19 +7230,7 @@
       <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">
-     <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>
+    <collection id="inputmethods_info" name="Input Methods Info" level="api">
      <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>
@@ -4601,6 +7241,729 @@
    </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">
@@ -4713,132 +8076,10 @@
      </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/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"/>
+      <unit bldFile="/mw/classicui/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"/>
@@ -4846,9 +8087,14 @@
     </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">
-     <component id="svgt_plat" filter="s60" name="SVG Tiny Platform Interfaces" class="api" introduced="9.2">
-      <unit bldFile="/mw/svgt/svgt_plat/group"/>
+    <collection id="svgt_plat" name="SVG Tiny Platform Interfaces" level="ui">
+     <component id="svgt_api" name="SVGT API" introduced="9.2" class="api" filter="s60">
+      <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">
@@ -4862,9 +8108,30 @@
     </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">
-     <component id="uiaccelerator_plat" filter="s60" name="UI Accelerator Platform Interfaces" class="api">
-      <unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/group"/>
+    <collection id="uiaccelerator_plat" name="UI Accelerator Platform Interfaces" level="if">
+     <component id="alf_core_toolkit_api" name="ALF Core Toolkit API" class="api" filter="s60">
+      <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">
@@ -4878,34 +8145,114 @@
     </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">
@@ -4978,6 +8325,26 @@
     </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">
@@ -5006,16 +8373,56 @@
       <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"/>
@@ -5035,16 +8442,100 @@
       <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">
@@ -5120,6 +8611,7 @@
     </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>
@@ -5168,22 +8660,52 @@
       <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">
@@ -5251,12 +8773,6 @@
      </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>
@@ -5266,6 +8782,45 @@
     </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"/>
@@ -5286,14 +8841,6 @@
       <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 -->
@@ -5341,13 +8888,109 @@
     </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"/>
@@ -5535,6 +9178,36 @@
     </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">
@@ -5631,9 +9304,6 @@
       <!-- 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">
@@ -5647,6 +9317,22 @@
     </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">
@@ -5690,18 +9376,26 @@
       <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"/>
@@ -5803,16 +9497,22 @@
       <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"/>
@@ -5822,7 +9522,8 @@
      </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"/>
@@ -5831,7 +9532,7 @@
       <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>
@@ -5861,21 +9562,78 @@
       <!--  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"/>
@@ -5898,9 +9656,6 @@
      <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">
@@ -5938,7 +9693,8 @@
     </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"/>
@@ -5958,14 +9714,6 @@
      <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">
@@ -5974,6 +9722,16 @@
     </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"/>
@@ -6001,13 +9759,28 @@
       <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"/>
@@ -6114,13 +9887,19 @@
       <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"/>
@@ -6144,19 +9923,30 @@
       <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">
@@ -6171,11 +9961,6 @@
       <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">
@@ -6295,6 +10080,12 @@
     </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">
@@ -6330,11 +10121,6 @@
       <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">
@@ -6350,6 +10136,243 @@
     </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"/>
@@ -6436,34 +10459,104 @@
      </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"/>
@@ -6660,18 +10753,124 @@
      </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"/>
@@ -6815,18 +11014,31 @@
      </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"/>
@@ -6965,15 +11177,22 @@
       <!-- 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">
@@ -7055,9 +11274,6 @@
      </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"/>
@@ -7065,32 +11281,44 @@
     </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"/>
@@ -7101,9 +11329,6 @@
      </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"/>
@@ -7112,6 +11337,28 @@
     </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"/>
@@ -7200,13 +11447,14 @@
       <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"/>
@@ -7259,13 +11507,22 @@
       <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"/>
@@ -7396,7 +11653,8 @@
       <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"/>
@@ -7404,40 +11662,43 @@
     </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"/>
-     </component>
-     <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"/>
+      <unit bldFile="/app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
+      <unit bldFile="/app/videoplayer/videoplayback/videoplaybackviews/tsrc/ut_userinputhandlertest/group" filter="test,unit_test"/>
      </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">
@@ -7491,13 +11752,46 @@
       <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"/>
@@ -7561,9 +11855,6 @@
       <!-- 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>
@@ -7599,6 +11890,16 @@
    <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">
@@ -7609,9 +11910,6 @@
      <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">
@@ -7651,6 +11949,18 @@
     </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"/>
@@ -7717,16 +12027,20 @@
       <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">
-     <component id="graphicsuis_plat" filter="s60" name="Graphics UIs Platform Interfaces" class="api">
-      <unit bldFile="/app/graphicsuis/graphicsuis_plat/group"/>
+    <collection id="graphicsuis_plat" name="Graphics UIs Platform Interfaces" level="ui">
+     <component id="svgt_viewer_ui_api" name="SVG-T Viewer UI API" class="api" filter="s60">
+      <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">
@@ -7736,6 +12050,12 @@
     </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"/>
@@ -7745,15 +12065,122 @@
      </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"/>
@@ -7851,9 +12278,6 @@
      <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">
@@ -7929,6 +12353,17 @@
     </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"/>
@@ -7949,12 +12384,9 @@
      </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>
--- a/symbian3/single/sysdefs/sf3.svg	Thu Mar 18 11:43:11 2010 +0000
+++ b/symbian3/single/sysdefs/sf3.svg	Fri Mar 19 14:46:47 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 2441.0000000000005 735.9242569670411" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 5165.599999999998 825.5984265184395" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: %d %b %Y</title>
  <defs>
   <style type="text/css">
@@ -423,16 +423,16 @@
 ]]><![CDATA[		
  		}
 	]]></script>
- <g id="os" transform="translate(3.1999999999999993 404.06)" class="layer">
-  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
-  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
-  <g class="layer-detail" transform="translate(282.20000000000033 3.2)">
-   <rect x="-269.4000000000003" class="layer" y="-3.2" width="2418.6000000000004" height="231.26000000000002"/>
+ <g id="os" transform="translate(3.1999999999999993 399.83000000000004)" class="layer">
+  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="227.03"/>
+  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="227.03" height="9.3" x="-113.815">OS</text>
+  <g class="layer-detail" transform="translate(509.8999999999999 3.2)">
+   <rect x="-497.0999999999999" class="layer" y="-3.2" width="5143.199999999998" height="227.03"/>
    <g>
-    <g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
+    <g id="kernelhwsrv" class="package" transform="translate( 0 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
      <rect class="package" x="0" width="131.39999999999998" height="101.43" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="131.39999999999998" x="65.69999999999999" y="100.42999999999999">Kernel &amp; HW Services</text>
+     <text text-anchor="middle" class="package" width="131.39999999999998" x="65.69999999999999" y="100.43">Kernel &amp; HW Services</text>
      <g transform="translate(0 3.2)">
       <g id="brdbootldr" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -683,10 +683,10 @@
       </g>
      </g>
     </g>
-    <g id="boardsupport" class="package" transform="translate( 133.49999999999997 123.43000000000002)">
+    <g id="boardsupport" class="package" transform="translate( 133.49999999999997 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.42999999999999">Board Support</text>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Board Support</text>
      <g transform="translate(0 3.2)">
       <g id="emulator" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -725,10 +725,10 @@
       </g>
      </g>
     </g>
-    <g id="buildtools" class="package" transform="translate( 163.49999999999997 123.43000000000002)">
+    <g id="buildtools" class="package" transform="translate( 163.49999999999997 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="45.6" height="101.43" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="45.6" x="22.8" y="100.42999999999999">Build Tools</text>
+     <text text-anchor="middle" class="package" width="45.6" x="22.8" y="100.43">Build Tools</text>
      <g transform="translate(0 3.2)">
       <g id="bldsystemtools" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -826,9 +826,471 @@
     </g>
     <g id="ossrv" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="200.70000000000002" height="120.23000000000002" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="200.70000000000002" x="100.35000000000001" y="119.23000000000002">Generic OS Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="1029.599999999999" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="1029.599999999999" x="514.7999999999995" y="105" dy="0.375em">Generic OS Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="ossrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="827.6999999999989"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="826.2999999999989" height="6.299999999999999">Generic OS Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="boost_apis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Boost APIs</text>
+        </g>
+        <g id="cpp_wrappers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Cpp wrappers</text>
+        </g>
+        <g id="character_type_apis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Character Type APIs</text>
+        </g>
+        <g id="compiler_specific_runtime_support" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Compiler Specific Runtime Support</text>
+        </g>
+        <g id="ossrv_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Generic OS Services Configuration API</text>
+        </g>
+        <g id="crypto_authentication_codes_and_hash_functions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Crypto Authentication Codes and Hash Functions API</text>
+        </g>
+        <g id="crypto_auxillary_functions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Crypto Auxillary Functions API</text>
+        </g>
+        <g id="crypto_certificates_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Crypto Certificates API</text>
+        </g>
+        <g id="crypto_inputoutput_and_data_encoding_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Crypto Input/Output and Data Encoding API</text>
+        </g>
+        <g id="crypto_public_key_cryptography_and_key_agreement_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Crypto Public Key Cryptography and Key Agreement API</text>
+        </g>
+        <g id="crypto_symmetric_ciphers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Crypto Symmetric Ciphers API</text>
+        </g>
+        <g id="crypto_utility_functions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Crypto Utility Functions API</text>
+        </g>
+        <g id="cryptogaphy_related_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Cryptogaphy Related API</text>
+        </g>
+        <g id="ossrv_debug_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Generic OS Services Debug API</text>
+        </g>
+        <g id="ossrv_exceptions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Generic OS Services Exceptions API</text>
+        </g>
+        <g id="gboxed" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">GBoxed API</text>
+        </g>
+        <g id="glib_arrays" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Glib Arrays API</text>
+        </g>
+        <g id="glib_asynchronous_queues" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Glib Asynchronous Queues API</text>
+        </g>
+        <g id="glib_atomic_operations" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Glib Atomic Operations API</text>
+        </g>
+        <g id="glib_automatic_string_completion" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Glib Automatic String Completion API</text>
+        </g>
+        <g id="glib_balanced_binary_trees" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Glib Balanced Binary Trees API</text>
+        </g>
+        <g id="glib_basic_types" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Glib Basic Types API</text>
+        </g>
+        <g id="glib_caches" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Glib Caches API</text>
+        </g>
+        <g id="glib_character_set_conversion" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Glib Character Set Conversion API</text>
+        </g>
+        <g id="glib_closures" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Glib Closures API</text>
+        </g>
+        <g id="glib_commandline_option_parser" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Glib Command Line Option Parser API</text>
+        </g>
+        <g id="glib_datasets" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Glib Datasets API</text>
+        </g>
+        <g id="glib_date_and_time_functions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Glib Date and Time Functions API</text>
+        </g>
+        <g id="glib_doubleended_queues" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Glib Double-ended Queues API</text>
+        </g>
+        <g id="glib_doublylinked_lists" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Glib Doubly-Linked Lists API</text>
+        </g>
+        <g id="glib_dynamic_loading_of_modules" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Glib Dynamic Loading of Modules API</text>
+        </g>
+        <g id="glib_enums_and_flags" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Glib Enums and Flags API</text>
+        </g>
+        <g id="glib_error_reporting" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">Glib Error Reporting API</text>
+        </g>
+        <g id="glib_file_utilities" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Glib File Utilities API</text>
+        </g>
+        <g id="glib_generic_values" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Glib Generic Values API</text>
+        </g>
+        <g id="glib_globstyle_pattern_matching" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">Glib Glob-Style Pattern Matching API</text>
+        </g>
+        <g id="glib_hash_tables" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">Glib Hash Tables API</text>
+        </g>
+        <g id="glib_hook_functions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Glib Hook Functions API</text>
+        </g>
+        <g id="glib_internationalization" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Glib  Internationalization API</text>
+        </g>
+        <g id="glib_io_channels" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">Glib I/O Channels API</text>
+        </g>
+        <g id="glib_keyvalue_file_parser" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Glib Key-Value File Parser API</text>
+        </g>
+        <g id="glib_lexical_scanner" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">Glib Lexical Scanner API</text>
+        </g>
+        <g id="glib_main_event_loop" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">Glib Main Event Loop API</text>
+        </g>
+        <g id="glib_memory_allocation" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Glib Memory Allocation API</text>
+        </g>
+        <g id="glib_memory_slices" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Glib Memory Slices API</text>
+        </g>
+        <g id="glib_message_logging" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">Glib Message Logging API</text>
+        </g>
+        <g id="glib_miscellaneous_utility_functions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Glib Miscellaneous Utility Functions API</text>
+        </g>
+        <g id="glib_nary_trees" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Glib N-ary Trees API</text>
+        </g>
+        <g id="glib_parameters_and_values" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="446.4000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="451.05000000000035">Glib Parameters and Values API</text>
+        </g>
+        <g id="glib_quarks" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="455.7000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="460.35000000000036">Glib Quarks API</text>
+        </g>
+        <g id="glib_random_numbers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="465.0000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="469.6500000000004">Glib Random Numbers API</text>
+        </g>
+        <g id="glib_relations_and_tuples" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="474.3000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="478.9500000000004">Glib Relations and Tuples API</text>
+        </g>
+        <g id="glib_shellrelated_utilities" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="483.6000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="488.2500000000004">Glib Shell-related Utilities API</text>
+        </g>
+        <g id="glib_signals" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="492.90000000000043" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="497.5500000000004">Glib Signals API</text>
+        </g>
+        <g id="glib_simple_xml_subset_parser" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="502.20000000000044" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="506.8500000000004">Glib Simple XML Subset Parser API</text>
+        </g>
+        <g id="glib_singlylinked_lists" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="511.50000000000045" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="516.1500000000004">Glib Singly-Linked Lists API</text>
+        </g>
+        <g id="glib_spawning_processes" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="520.8000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="525.4500000000004">Glib Spawning Processes API</text>
+        </g>
+        <g id="glib_standard_macros" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="530.1000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="534.7500000000003">Glib Standard Macros API</text>
+        </g>
+        <g id="glib_string_utility_functions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="539.4000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="544.0500000000003">Glib String Utility Functions API</text>
+        </g>
+        <g id="glib_strings" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="548.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="553.3500000000003">Glib Strings API</text>
+        </g>
+        <g id="glib_thread_pools" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="558.0000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="562.6500000000002">Glib Thread Pools API</text>
+        </g>
+        <g id="glib_threads" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="567.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="571.9500000000002">Glib Threads API</text>
+        </g>
+        <g id="glib_timers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="576.6000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="581.2500000000001">Glib Timers API</text>
+        </g>
+        <g id="glib_unicode_manipulation" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="585.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="590.5500000000001">Glib Unicode Manipulation API</text>
+        </g>
+        <g id="glib_value_arrays" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="595.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="599.85">Glib Value Arrays API</text>
+        </g>
+        <g id="glib_varargs_value_collection" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="604.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="609.15">Glib Varargs Value Collection API</text>
+        </g>
+        <g id="gobject" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="613.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="618.4499999999999">GObject API</text>
+        </g>
+        <g id="gparamspec" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="623.0999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="627.7499999999999">GParamSpec API</text>
+        </g>
+        <g id="gtype" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="632.3999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="637.0499999999998">GType API</text>
+        </g>
+        <g id="gtypemodule" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="641.6999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="646.3499999999998">GTypeModule API</text>
+        </g>
+        <g id="gtypeplugin" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="650.9999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="655.6499999999998">GTypePlugin API</text>
+        </g>
+        <g id="io_stream_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="660.2999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="664.9499999999997">I/O stream API</text>
+        </g>
+        <g id="localization_function_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="669.5999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="674.2499999999997">Localization Function API</text>
+        </g>
+        <g id="math_operations_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="678.8999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="683.5499999999996">Math Operations API</text>
+        </g>
+        <g id="ossrv_memory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="688.1999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="692.8499999999996">Generic OS Services Memory API</text>
+        </g>
+        <g id="no_namespace_headers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="697.4999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="702.1499999999995">No Namespace Headers</text>
+        </g>
+        <g id="openc_headers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="706.7999999999995" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="711.4499999999995">OpenC headers</text>
+        </g>
+        <g id="openc_wrappers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="716.0999999999995" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="720.7499999999994">OpenC wrappers</text>
+        </g>
+        <g id="ssl_general_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="725.3999999999994" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="730.0499999999994">SSL General API</text>
+        </g>
+        <g id="ssl_protocol_methods_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="734.6999999999994" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="739.3499999999993">SSL Protocol Methods API</text>
+        </g>
+        <g id="standard_compressiondecompression_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="743.9999999999993" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="748.6499999999993">Standard Compression/Decompression API</text>
+        </g>
+        <g id="stl" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="753.2999999999993" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="757.9499999999993">STL API</text>
+        </g>
+        <g id="thread_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="762.5999999999992" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="767.2499999999992">Thread API</text>
+        </g>
+        <g id="type_attributes" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="771.8999999999992" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="776.5499999999992">Type Attributes API</text>
+        </g>
+        <g id="typeinfo" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="781.1999999999991" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="785.8499999999991">Type Info API</text>
+        </g>
+        <g id="utility_apis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="790.4999999999991" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="795.1499999999991">Utility APIs</text>
+        </g>
+        <g id="wide_character_classapis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="799.799999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="804.449999999999">Wide character class/apis</text>
+        </g>
+        <g id="dbus_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="809.099999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="813.749999999999">Dbus API</text>
+        </g>
+        <g id="dbus-glib" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="818.399999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="823.0499999999989">Dbus-glib API</text>
+        </g>
+       </g>
+      </g>
+      <g id="ossrv_plat" transform="translate(829.7999999999989 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Generic OS Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="libutils_apis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Utility Library APIs</text>
+        </g>
+       </g>
+      </g>
       <g id="stdlibs" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Standard Libraries</text>
@@ -862,7 +1324,7 @@
         </g>
        </g>
       </g>
-      <g id="glib" transform="translate(0 0)" class="collection">
+      <g id="glib" transform="translate(847.499999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">GLib</text>
        <g transform="translate(0 6.299999999999999)">
@@ -904,7 +1366,7 @@
         </g>
        </g>
       </g>
-      <g id="ofdbus" transform="translate(48.6 0)" class="collection">
+      <g id="ofdbus" transform="translate(896.0999999999989 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Open Found­ation D-Bus</text>
        <g transform="translate(0 6.299999999999999)">
@@ -936,7 +1398,7 @@
         </g>
        </g>
       </g>
-      <g id="genericservices" transform="translate(78.60000000000001 0)" class="collection">
+      <g id="genericservices" transform="translate(926.0999999999989 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Generic Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -978,7 +1440,7 @@
         </g>
        </g>
       </g>
-      <g id="syslibsapitest" transform="translate(145.8 0)" class="collection placeholder">
+      <g id="syslibsapitest" transform="translate(993.2999999999989 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SysLibs API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -995,8 +1457,8 @@
        </g>
       </g>
       <g id="genericopenlibs" transform="translate(38.400000000000006 37.6)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Generic Open Libraries</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Generic Open Libraries</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="cstdlib" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -1018,6 +1480,11 @@
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">POSIX Realtime Ext.</text>
         </g>
+        <g id="liboil" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Liboil</text>
+        </g>
        </g>
       </g>
       <g id="lowlevellibsandfws" transform="translate(0 75.2)" class="collection">
@@ -1041,39 +1508,29 @@
         </g>
        </g>
       </g>
-      <g id="ossrv_info" transform="translate(163.5 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Generic OS Services Info</text>
+      <g id="ossrv_info" transform="translate(1010.999999999999 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Generic OS Services Info</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="ossrv_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Generic OS Services Build</text>
         </g>
-        <g id="ossrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Generic OS Services Platform Inter­faces</text>
-        </g>
-        <g id="ossrv_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Generic OS Services Public Inter­faces</text>
-        </g>
         <g id="ossrv_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Generic OS Services Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="persistentdata" class="package" transform="translate( 202.8 0)">
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Generic OS Services Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="persistentdata" class="package" transform="translate( 1031.699999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="67.19999999999999" height="120.23000000000002" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="119.23000000000002">Persistent Data Services</text>
+     <rect class="package" x="0" width="67.19999999999999" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="105" dy="0.375em">Persistent Data Services</text>
      <g transform="translate(0 3.2)">
       <g id="featuremgmt" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -1175,11 +1632,333 @@
       </g>
      </g>
     </g>
-    <g id="devicesrv" class="package" transform="translate( 272.1 0)">
+    <g id="devicesrv" class="package" transform="translate( 1100.9999999999989 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="129.6" height="120.23000000000002" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="129.6" x="64.8" y="119.23000000000002">Dev­ice Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="698.1000000000005" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="698.1000000000005" x="349.05000000000024" y="105" dy="0.375em">Dev­ice Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="devicesrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Dev­ice Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="platform_path_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Platform Path Definitions API</text>
+        </g>
+        <g id="common_platform_security_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Common Platform Security Definitions API</text>
+        </g>
+        <g id="feature_discovery_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Feature Discovery API</text>
+        </g>
+        <g id="platform_environment_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Platform Environment API</text>
+        </g>
+        <g id="sensor_channel_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Sensor Channel API</text>
+        </g>
+        <g id="sensor_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Sensor Definitions API</text>
+        </g>
+        <g id="version_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Version Info API</text>
+        </g>
+        <g id="accessory_monitoring_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Accessory Monitoring API</text>
+        </g>
+        <g id="haptics_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Haptics API</text>
+        </g>
+        <g id="sensor_data_compensator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Sensor Data Compensator API</text>
+        </g>
+        <g id="platform_path_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Platform Path Definitions API</text>
+        </g>
+       </g>
+      </g>
+      <g id="devicesrv_plat" transform="translate(104.39999999999998 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="474.3000000000004"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="472.90000000000043" height="6.299999999999999">Dev­ice Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="configuration_file_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Configuration File Parser API</text>
+        </g>
+        <g id="dos_extension_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">DOS Extension Plug-In API</text>
+        </g>
+        <g id="mediator_command_initiator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Mediator Command Initiator API</text>
+        </g>
+        <g id="syslangutil_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">SysLangUtil API</text>
+        </g>
+        <g id="wakeup_alarm_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Wakeup Alarm API</text>
+        </g>
+        <g id="disk_and_memory_level_keys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Disk and Memory Level Keys API</text>
+        </g>
+        <g id="mediator_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Mediator Plugin API</text>
+        </g>
+        <g id="headset_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Headset Status API</text>
+        </g>
+        <g id="system_startup_extension_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">System Startup Extension Plugin API</text>
+        </g>
+        <g id="sensor_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Sensor Plugin API</text>
+        </g>
+        <g id="accessory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Accessory API</text>
+        </g>
+        <g id="display_language_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Display Language Definition API</text>
+        </g>
+        <g id="mediator_command_responder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Mediator Command Responder API</text>
+        </g>
+        <g id="accessory_policy_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Accessory Policy Definitions API</text>
+        </g>
+        <g id="hw_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Hardware Settings API</text>
+        </g>
+        <g id="mediator_domain_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Mediator Domain Definitions API</text>
+        </g>
+        <g id="sensor_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Sensor Extension API</text>
+        </g>
+        <g id="accessory_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Accessory Plugin API</text>
+        </g>
+        <g id="sae_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">SAE API</text>
+        </g>
+        <g id="accessory_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Accessory Control API</text>
+        </g>
+        <g id="mediator_static_registration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Mediator Static Registration API</text>
+        </g>
+        <g id="accessory_key_event_handling_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Accessory Key Event Handling API</text>
+        </g>
+        <g id="mediator_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Mediator Notification API</text>
+        </g>
+        <g id="accessory_policy_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Accessory Policy Utility API</text>
+        </g>
+        <g id="common_dsy_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Common DSY Plugin API</text>
+        </g>
+        <g id="remote_control_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Remote Control Extension API</text>
+        </g>
+        <g id="sensor_channel_filter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Sensor Channel Filter API</text>
+        </g>
+        <g id="dos_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">DOS Extension API</text>
+        </g>
+        <g id="accessory_audio_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Accessory Audio Control API</text>
+        </g>
+        <g id="mediator_event_consumer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Mediator Event Consumer API</text>
+        </g>
+        <g id="shared_data_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Shared Data API</text>
+        </g>
+        <g id="accessory_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Accessory Settings API</text>
+        </g>
+        <g id="accessory_bluetooth_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">Accessory Bluetooth Control API</text>
+        </g>
+        <g id="extended_version_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Extended Version Info API</text>
+        </g>
+        <g id="mediator_event_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Mediator Event Provider API</text>
+        </g>
+        <g id="tv_out_config_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">TV Out Config API</text>
+        </g>
+        <g id="tspclientmapper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">TSP Client Mapper API</text>
+        </g>
+        <g id="powersave_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Power Save API</text>
+        </g>
+        <g id="powersave_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Power Save Definitions API</text>
+        </g>
+        <g id="powersave_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">Power Save Plugin API</text>
+        </g>
+        <g id="extended_version_info_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Extended Version Info Plugin API</text>
+        </g>
+        <g id="haptics_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">Haptics Plugin API</text>
+        </g>
+        <g id="haptics_effect_data_getter_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">Haptics Effect Data Getter Plugin API</text>
+        </g>
+        <g id="haptics_packetizer_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Haptics Packetizer Plugin API</text>
+        </g>
+        <g id="tiltcompensation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Tilt Compensation API</text>
+        </g>
+        <g id="disk_notification_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">Disk Notification Handler API</text>
+        </g>
+        <g id="accessory_policy_usb_audio_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Accessory Policy USB Audio API</text>
+        </g>
+        <g id="accessory_policy_hdmi_audio_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Accessory Policy HDMI Audio API</text>
+        </g>
+        <g id="sensor_data_compensator_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="446.4000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="451.05000000000035">Sensor Data Compensator Plugin API</text>
+        </g>
+        <g id="ddc_access_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="455.7000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="460.35000000000036">DDC Access API</text>
+        </g>
+        <g id="tv_out_behaviour_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="465.0000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="469.6500000000004">TV Out Behaviour API</text>
+        </g>
+       </g>
+      </g>
       <g id="accessoryservices" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Accessory Services</text>
@@ -1226,7 +2005,7 @@
         </g>
        </g>
       </g>
-      <g id="commonservices" transform="translate(0 0)" class="collection">
+      <g id="commonservices" transform="translate(580.8000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Common Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1340,7 +2119,7 @@
         </g>
        </g>
       </g>
-      <g id="mediator" transform="translate(48.6 0)" class="collection">
+      <g id="mediator" transform="translate(629.4000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Mediator</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1351,7 +2130,7 @@
         </g>
        </g>
       </g>
-      <g id="psmservices" transform="translate(66.3 0)" class="collection">
+      <g id="psmservices" transform="translate(647.1000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Power Save Mode Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1493,39 +2272,29 @@
         </g>
        </g>
       </g>
-      <g id="devicesrvapitest" transform="translate(84 0)" class="collection placeholder">
+      <g id="devicesrvapitest" transform="translate(664.8000000000004 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Devices Services API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="devicesrv_info" transform="translate(101.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Dev­ice Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="devicesrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Dev­ice Services Platform Inter­faces</text>
-        </g>
-        <g id="devicesrv_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Dev­ice Services Public Inter­faces</text>
-        </g>
+      <g id="devicesrv_info" transform="translate(682.5000000000005 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Dev­ice Services Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="devicesrv_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Dev­ice Services Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="security" class="package" transform="translate( 403.8 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Dev­ice Services Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="security" class="package" transform="translate( 1801.1999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="74.7" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="74.7" x="37.35" y="119.23000000000002">OS Security</text>
+     <rect class="package" x="0" width="93.3" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="93.3" x="46.65" y="105" dy="0.375em">OS Security</text>
      <g transform="translate(0 3.2)">
       <g id="authenticationservices" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -1555,8 +2324,8 @@
        </g>
       </g>
       <g id="contentmgmt" transform="translate(38.400000000000006 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Content Manage­ment</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Content Manage­ment</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="contentaccessfwfordrm" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -1568,6 +2337,17 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 2; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">CAF Recogniser Config</text>
         </g>
+        <g id="referencedrmagent" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Reference DRM Agent</text>
+        </g>
+        <g id="cafstreamingsupport" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">CAF Streaming Support</text>
+        </g>
        </g>
       </g>
       <g id="crypto" transform="translate(0 56.400000000000006)" class="collection">
@@ -1641,8 +2421,8 @@
        </g>
       </g>
       <g id="cryptoservices" transform="translate(17.7 75.2)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Crypto Services</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Crypto Services</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="certificateandkeymgmt" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -1659,14 +2439,19 @@
          <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Browser Root Certificates</text>
         </g>
-        <g id="asnpkcs" class="component">
+        <g id="rootcertificates" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">ASN PKCS</text>
-        </g>
-       </g>
-      </g>
-      <g id="security_info" transform="translate(59.10000000000001 0)" class="collection">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Root Certificates</text>
+        </g>
+        <g id="asnpkcs" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">ASN PKCS</text>
+        </g>
+       </g>
+      </g>
+      <g id="security_info" transform="translate(77.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">OS Security Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1680,10 +2465,10 @@
       </g>
      </g>
     </g>
-    <g id="lbs" class="package" transform="translate( 480.6 0)">
+    <g id="lbs" class="package" transform="translate( 1896.5999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="71.7" height="120.23000000000002" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="71.7" x="35.85" y="119.23000000000002">Locating Services</text>
+     <rect class="package" x="0" width="71.7" height="116.00000000000001" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="71.7" x="35.85" y="115.00000000000001">Locating Services</text>
      <g transform="translate(0 3.2)">
       <g id="datasourcemodules" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
@@ -1843,10 +2628,10 @@
       </g>
      </g>
     </g>
-    <g id="commsfw" class="package" transform="translate( 554.4 0)">
+    <g id="commsfw" class="package" transform="translate( 1970.3999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="66.30000000000001" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="66.30000000000001" x="33.150000000000006" y="119.23000000000002">Comms Frame­work</text>
+     <rect class="package" x="0" width="66.30000000000001" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="66.30000000000001" x="33.150000000000006" y="115.00000000000001">Comms Frame­work</text>
      <g transform="translate(0 3.2)">
       <g id="commsprocess" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2010,10 +2795,10 @@
       </g>
      </g>
     </g>
-    <g id="networkingsrv" class="package" transform="translate( 622.8 0)">
+    <g id="networkingsrv" class="package" transform="translate( 2038.7999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="170.70000000000002" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="119.23000000000002">Network­ing Services</text>
+     <rect class="package" x="0" width="170.70000000000002" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="105" dy="0.375em">Network­ing Services</text>
      <g transform="translate(0 3.2)">
       <g id="esockapiextensions" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2270,11 +3055,103 @@
       </g>
      </g>
     </g>
-    <g id="wlan" class="package" transform="translate( 795.6 0)">
+    <g id="wlan" class="package" transform="translate( 2211.5999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="55.8" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="119.23000000000002">WLAN</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="192.6" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="192.6" x="96.3" y="86.2" dy="0.375em">WLAN</text>
+     <g transform="translate(0 3.2)">
+      <g id="wlan_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="139.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="138.1" height="6.299999999999999">WLAN Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wlan_dbif_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">WLAN DBIF API</text>
+        </g>
+        <g id="wlan_hal_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">WLAN HAL API</text>
+        </g>
+        <g id="wlan_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">WLAN Management API</text>
+        </g>
+        <g id="wlan_device_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">WLAN Device Settings API</text>
+        </g>
+        <g id="wlan_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">WLAN Control API</text>
+        </g>
+        <g id="wlan_hw_initialization_data_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">WLAN Hardware Initialization Data API</text>
+        </g>
+        <g id="wlan_power_save_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">WLAN Power Save Plugin API</text>
+        </g>
+        <g id="wlan_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">WLAN Info API</text>
+        </g>
+        <g id="wlan_agent_hotspot_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">WLAN Agent Hotspot Plug-in API</text>
+        </g>
+        <g id="wlan_osa_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">WLAN OSA API</text>
+        </g>
+        <g id="wlan_spia_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">WLAN SPIA API</text>
+        </g>
+        <g id="wlan_hpa_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">WLAN HPA API</text>
+        </g>
+        <g id="wlan_eapol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">WLAN EAPOL Plugin API</text>
+        </g>
+        <g id="wlan_generic_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">WLAN Generic Plugin API</text>
+        </g>
+        <g id="wlan_aws_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">WLAN AWS Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="wlan_pub" transform="translate(141.6 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">WLAN Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wlan_sdk_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">WLAN SDK Info API</text>
+        </g>
+       </g>
+      </g>
       <g id="wlan_bearer" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">WLAN Bearer</text>
@@ -2311,39 +3188,29 @@
         </g>
        </g>
       </g>
-      <g id="wlanapitest" transform="translate(0 0)" class="collection placeholder">
+      <g id="wlanapitest" transform="translate(159.29999999999998 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="wlan_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">WLAN Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="wlan_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">WLAN Public Inter­faces</text>
-        </g>
-        <g id="wlan_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">WLAN Platform Inter­faces</text>
-        </g>
+      <g id="wlan_info" transform="translate(177 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">WLAN Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="wlan_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">WLAN Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="cellularsrv" class="package" transform="translate( 853.5 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">WLAN Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="cellularsrv" class="package" transform="translate( 2406.2999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="101.39999999999998" height="120.23000000000002" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="119.23000000000002">Cellular Baseband Services</text>
+     <rect class="package" x="0" width="101.39999999999998" height="116.00000000000001" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="85.79999999999998" x="58.499999999999986" y="86.2" dy="0.375em">Cellular Baseband Services</text>
      <g transform="translate(0 3.2)">
       <g id="basebandabstraction" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2367,17 +3234,6 @@
         </g>
        </g>
       </g>
-      <g id="fax" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Fax</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="faxclientandserver" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Fax Client &amp; Server</text>
-        </g>
-       </g>
-      </g>
       <g id="smsprotocols" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SMS Protocols</text>
@@ -2440,7 +3296,7 @@
         </g>
        </g>
       </g>
-      <g id="telephonyserver" transform="translate(17.7 18.8)" class="collection">
+      <g id="telephonyserver" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Telephony Server</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2570,11 +3426,32 @@
       </g>
      </g>
     </g>
-    <g id="bt" class="package" transform="translate( 957 0)">
+    <g id="bt" class="package" transform="translate( 2509.7999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="65.1" height="120.23000000000002" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">Blue­tooth</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="81" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="81" x="40.5" y="105" dy="0.375em">Blue­tooth</text>
+     <g transform="translate(0 3.2)">
+      <g id="bt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Bluetooth Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="bluetooth_audio_adaptation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Bluetooth Audio Adaptation API</text>
+        </g>
+        <g id="bluetooth_power_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Bluetooth Power Management API</text>
+        </g>
+        <g id="at_command_handler_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">AT Command Handler Plugin API</text>
+        </g>
+       </g>
+      </g>
       <g id="bluetooth" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Blue­tooth Core</text>
@@ -2643,7 +3520,7 @@
         </g>
        </g>
       </g>
-      <g id="bluetoothcommsprofiles" transform="translate(0 0)" class="collection">
+      <g id="bluetoothcommsprofiles" transform="translate(30.000000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Btooth. Comms Profiles</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2686,7 +3563,7 @@
         </g>
        </g>
       </g>
-      <g id="bluetoothapitest" transform="translate(17.7 0)" class="collection placeholder">
+      <g id="bluetoothapitest" transform="translate(47.7 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Blue­tooth API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2702,30 +3579,36 @@
         </g>
        </g>
       </g>
-      <g id="bt_info" transform="translate(35.4 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Blue­tooth Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="bt_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">bt_plat</text>
-        </g>
+      <g id="bt_info" transform="translate(65.4 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Blue­tooth Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="bt_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Blue­tooth Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="usb" class="package" transform="translate( 1024.1999999999998 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Blue­tooth Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="usb" class="package" transform="translate( 2592.899999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23000000000002">USB</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">USB</text>
+     <g transform="translate(0 3.2)">
+      <g id="usb_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">USB Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="usb_audio_stream_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">USB Audio Stream Plugin API</text>
+        </g>
+       </g>
+      </g>
       <g id="usbldd" transform="translate(0 75.2)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Logical Dev­ice Drivers</text>
@@ -2748,30 +3631,432 @@
         </g>
        </g>
       </g>
-      <g id="usb_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">USB Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="usb_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">USB Platform Interfaces</text>
-        </g>
+      <g id="usb_info" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">USB Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="usb_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">USB Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="mm" class="package" transform="translate( 1054.1999999999998 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">USB Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="mm" class="package" transform="translate( 2628.2999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="167.7" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="167.7" x="83.85" y="119.23000000000002">Multi­media</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="795.8999999999996" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="749.3999999999996" x="421.1999999999998" y="86.2" dy="0.375em">Multi­media</text>
+     <g transform="translate(0 3.2)">
+      <g id="mm_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">MM Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="audio_effects_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Audio Effects API</text>
+        </g>
+        <g id="audio_effects_presets_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Audio Effects Presets API</text>
+        </g>
+        <g id="drm_audio_player_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">DRM Audio Player API</text>
+        </g>
+        <g id="multimedia_extension_interfaces_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Multimedia Extension Interfaces API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mm_plat" transform="translate(39.300000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="697.4999999999996"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="696.0999999999996" height="6.299999999999999">MM Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="aac_decoder_config_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">AAC Decoder Config API</text>
+        </g>
+        <g id="aac_decoder_config_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AAC Decoder Config Msg Hdlr API</text>
+        </g>
+        <g id="aac_decoder_config_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">AAC Decoder Config Proxy API</text>
+        </g>
+        <g id="added_devsound_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Added DevSound Control API</text>
+        </g>
+        <g id="added_devsound_control_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Added DevSound Control Msg Hdlr API</text>
+        </g>
+        <g id="added_devsound_control_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Added DevSound Control Proxy API</text>
+        </g>
+        <g id="audio_effects_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Audio Effects Message Handler API</text>
+        </g>
+        <g id="audio_effects_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Audio Effects Proxy API</text>
+        </g>
+        <g id="audio_policy_header_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Audio Policy Header API</text>
+        </g>
+        <g id="audio_routing_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Audio Routing API</text>
+        </g>
+        <g id="audio_routing_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Audio Routing Msg Hdlr API</text>
+        </g>
+        <g id="audio_routing_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Audio Routing Proxy API</text>
+        </g>
+        <g id="custom_interface_builder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Custom Interface Builder API</text>
+        </g>
+        <g id="custom_interface_message_handler_factory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Custom Interface Message Handler Factory API</text>
+        </g>
+        <g id="custom_interface_proxy_factory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Custom Interface Proxy Factory API</text>
+        </g>
+        <g id="custom_interface_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Custom Interface Utility API</text>
+        </g>
+        <g id="devsound_adaptation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">DevSound Adaptation API</text>
+        </g>
+        <g id="display_posting_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Display Posting API</text>
+        </g>
+        <g id="eaac_plus_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">eAAC Plus Decoder Interface API</text>
+        </g>
+        <g id="eaac_plus_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">eAAC Plus Decoder Interface Message Handler API</text>
+        </g>
+        <g id="eaac_plus_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">eAAC Plus Decoder Interface Proxy API</text>
+        </g>
+        <g id="error_concealment_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Error Concealment Interface API</text>
+        </g>
+        <g id="error_concealment_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Error Concealment Interface Message Handler API</text>
+        </g>
+        <g id="error_concealment_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Error Concealment Interface Proxy API</text>
+        </g>
+        <g id="fm_radio_adaptation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">FM Radio Adaptation API</text>
+        </g>
+        <g id="g711_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">G711 Decoder Interface API</text>
+        </g>
+        <g id="g711_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">G711 Decoder Interface Message Handler API</text>
+        </g>
+        <g id="g711_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">G711 Decoder Interface Proxy API</text>
+        </g>
+        <g id="g711_encoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">G711 Encoder Interface API</text>
+        </g>
+        <g id="g711_encoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">G711 Encoder Interface Message Handler API</text>
+        </g>
+        <g id="g711_encoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">G711 Encoder Interface Proxy API</text>
+        </g>
+        <g id="g729_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">G729 Decoder Interface API</text>
+        </g>
+        <g id="g729_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">G729 Decoder Interface Message Handler API</text>
+        </g>
+        <g id="g729_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">G729 Decoder Interface Proxy API</text>
+        </g>
+        <g id="g729_encoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">G729 Encoder Interface API</text>
+        </g>
+        <g id="g729_encoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">G729 Encoder Interface Proxy API</text>
+        </g>
+        <g id="g729_encoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">G729 Encoder Interface Message Handler API</text>
+        </g>
+        <g id="global_audio_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Global Audio Settings API</text>
+        </g>
+        <g id="global_audio_settings_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Global Audio Settings Definition API</text>
+        </g>
+        <g id="ilbc_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">Ilbc Decoder Interface API</text>
+        </g>
+        <g id="ilbc_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Ilbc Decoder Interface Message Handler API</text>
+        </g>
+        <g id="ilbc_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">Ilbc Decoder Interface Proxy API</text>
+        </g>
+        <g id="ilbc_encoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">Ilbc Encoder Interface API</text>
+        </g>
+        <g id="ilbc_encoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Ilbc Encoder Interface Message Handler API</text>
+        </g>
+        <g id="ilbc_encoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Ilbc Encoder Interface Proxy API</text>
+        </g>
+        <g id="mdf_plugin_uids" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">MDF Plug-in UIDs</text>
+        </g>
+        <g id="multimedia_fourcc_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Multimedia FourCC Definitions API</text>
+        </g>
+        <g id="nokia_audio_policy_header_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Nokia Audio Policy Header API</text>
+        </g>
+        <g id="nokia_multimedia_fourcc_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="446.4000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="451.05000000000035">Nokia Multimedia Fourcc Definitions API</text>
+        </g>
+        <g id="ra8_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="455.7000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="460.35000000000036">RA8 Decoder Interface API</text>
+        </g>
+        <g id="ra8_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="465.0000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="469.6500000000004">RA8 Decoder Interface Message Handler API</text>
+        </g>
+        <g id="ra8_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="474.3000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="478.9500000000004">RA8 Decoder Interface Proxy API</text>
+        </g>
+        <g id="rds_adaptation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="483.6000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="488.2500000000004">RDS Adaptation API</text>
+        </g>
+        <g id="restricted_audio_output_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="492.90000000000043" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="497.5500000000004">Restricted Audio Output API</text>
+        </g>
+        <g id="restricted_audio_output_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="502.20000000000044" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="506.8500000000004">Restricted Audio Output Message Handler API</text>
+        </g>
+        <g id="restricted_audio_output_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="511.50000000000045" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="516.1500000000004">Restricted Audio Output Proxy API</text>
+        </g>
+        <g id="sbc_encoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="520.8000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="525.4500000000004">SBC Encoder Interface API</text>
+        </g>
+        <g id="sbc_encoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="530.1000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="534.7500000000003">SBC Encoder Interface Message Handler API</text>
+        </g>
+        <g id="sbc_encoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="539.4000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="544.0500000000003">SBC Encoder Interface Proxy API</text>
+        </g>
+        <g id="secure_output_mdf_custom_interface" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="548.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="553.3500000000003">Secure Output MDF Custom Interface</text>
+        </g>
+        <g id="speech_encoder_config_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="558.0000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="562.6500000000002">Speech Encoder Config API</text>
+        </g>
+        <g id="speech_encoder_config_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="567.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="571.9500000000002">Speech Encoder Config Message Handler API</text>
+        </g>
+        <g id="speech_encoder_config_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="576.6000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="581.2500000000001">Speech Encoder Config Proxy API</text>
+        </g>
+        <g id="telephony_audio_routing_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="585.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="590.5500000000001">Telephony Audio Routing Client API</text>
+        </g>
+        <g id="telephony_audio_routing_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="595.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="599.85">Telephony Audio Routing Manager API</text>
+        </g>
+        <g id="video_buffer_management_mdf_custom_interface" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="604.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="609.15">Video Buffer Management MDF Custom Interface</text>
+        </g>
+        <g id="video_decoder_rotation_mdf_custom_interface" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="613.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="618.4499999999999">Video Decoder Rotation MDF Custom Interface</text>
+        </g>
+        <g id="video_decoder_scaling_mdf_custom_interface" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="623.0999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="627.7499999999999">Video Decoder Scaling MDF Custom Interface</text>
+        </g>
+        <g id="video_reclaim_extbuffers_ci" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="632.3999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="637.0499999999998">Video Reclaim Extbuffers Custom Interface</text>
+        </g>
+        <g id="video_window_control_custom_interface" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="641.6999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="646.3499999999998">Video Window Control Custom Interface</text>
+        </g>
+        <g id="wma_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="650.9999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="655.6499999999998">WMA Decoder Interface API</text>
+        </g>
+        <g id="wma_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="660.2999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="664.9499999999997">WMA Decoder Interface Message Handler API</text>
+        </g>
+        <g id="wma_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="669.5999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="674.2499999999997">WMA Decoder Interface Proxy API</text>
+        </g>
+        <g id="eaacplusutil_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="678.8999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="683.5499999999996">EAac Plus Util API</text>
+        </g>
+        <g id="frametable_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="688.1999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="692.8499999999996">Frametable API</text>
+        </g>
+       </g>
+      </g>
       <g id="devsoundextensions" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="111.59999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="110.19999999999997" height="6.299999999999999">Devsound Exten­sions</text>
@@ -2865,7 +4150,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Codecs</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imagingandcamerafws" transform="translate(0 0)" class="collection">
+      <g id="imagingandcamerafws" transform="translate(738.8999999999996 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Imaging &amp; Camera Fmwks.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2923,31 +4208,21 @@
         </g>
        </g>
       </g>
-      <g id="mm_info" transform="translate(20.700000000000003 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Multi­media Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="mm_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">MM Platform Inter­faces</text>
-        </g>
-        <g id="mm_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">MM Public Inter­faces</text>
-        </g>
+      <g id="mm_info" transform="translate(759.5999999999996 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Multi­media Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="mmdocs" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipRT" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipRT"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Multi­media Docs</text>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipRT" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipRT"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Multi­media Docs</text>
         </g>
         <g id="mm_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Multi­media Metadata</text>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Multi­media Metadata</text>
         </g>
        </g>
       </g>
@@ -3112,7 +4387,7 @@
         </g>
        </g>
       </g>
-      <g id="mmapitest" transform="translate(60.00000000000001 0)" class="collection">
+      <g id="mmapitest" transform="translate(780.2999999999996 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Multi­media API Tests</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3126,12 +4401,59 @@
       </g>
      </g>
     </g>
-    <g id="imagingext" class="package" transform="translate( 1223.9999999999998 0)">
+    <g id="imagingext" class="package" transform="translate( 3426.299999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="39.300000000000004" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="119.23000000000002">Imaging Exten­sions</text>
-     <g transform="translate(0 3.2)">
-      <g id="imageadaptationextensions" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="94.2" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="94.2" x="47.1" y="105" dy="0.375em">Imaging Exten­sions</text>
+     <g transform="translate(0 3.2)">
+      <g id="imagingext_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Imaging Ext. Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="exif_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Exif API</text>
+        </g>
+       </g>
+      </g>
+      <g id="imagingext_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Imaging Ext. Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="jpeg2000_icl_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">JPEG2000 ICL plugin API</text>
+        </g>
+        <g id="extended_icl_jpeg_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Extended ICL Jpeg API</text>
+        </g>
+        <g id="h324_annex_k_custom_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">H324 Annex K Custom API</text>
+        </g>
+        <g id="ecam_orientation_custom_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">ECam Orientation Custom API</text>
+        </g>
+        <g id="ecam_ui_orientation_override_custom_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">ECam UI Orientation Override Custom API</text>
+        </g>
+        <g id="ecam_face_tracking_custom_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">ECam Face Tracking Custom API</text>
+        </g>
+       </g>
+      </g>
+      <g id="imageadaptationextensions" transform="translate(75.6 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Image Adapt. Ext.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3163,28 +4485,12 @@
         </g>
        </g>
       </g>
-      <g id="imagingext_info" transform="translate(20.700000000000003 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Imaging Ext. Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="imagingext_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Imaging Ext. Platform Inter­faces</text>
-        </g>
-        <g id="imagingext_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Imaging Ext. Public Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="graphics" class="package" transform="translate( 1265.3999999999999 0)">
+     </g>
+    </g>
+    <g id="graphics" class="package" transform="translate( 3522.599999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="105.60000000000001" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="105.60000000000001" x="52.800000000000004" y="119.23000000000002">Graphics</text>
+     <rect class="package" x="0" width="113.1" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="97.5" x="64.35" y="29.8" dy="0.375em">Graphics</text>
      <g transform="translate(0 3.2)">
       <g id="graphicsaccelaration" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -3285,30 +4591,36 @@
         </g>
        </g>
       </g>
-      <g id="graphics_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Graphics Info</text>
+      <g id="graphics_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Graphics Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="m3g_core_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
          <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">M3G Core API</text>
         </g>
+       </g>
+      </g>
+      <g id="graphics_info" transform="translate(35.4 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Graphics Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="graphicsdocs" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipRT" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipRT"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Graphics Docs</text>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipRT" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipRT"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Graphics Docs</text>
         </g>
         <g id="graphics_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Graphics Metadata</text>
-        </g>
-       </g>
-      </g>
-      <g id="windowing" transform="translate(47.7 0)" class="collection">
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Graphics Metadata</text>
+        </g>
+       </g>
+      </g>
+      <g id="windowing" transform="translate(56.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Windowing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3324,7 +4636,7 @@
         </g>
        </g>
       </g>
-      <g id="printingservices" transform="translate(68.4 0)" class="collection">
+      <g id="printingservices" transform="translate(76.80000000000001 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Printing Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3468,18 +4780,50 @@
         </g>
        </g>
       </g>
-      <g id="graphicsapitest" transform="translate(89.10000000000001 0)" class="collection placeholder">
+      <g id="graphicsapitest" transform="translate(97.5 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 1373.1 0)">
+    <g id="textandloc" class="package" transform="translate( 3637.799999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="76.5" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="76.5" x="38.25" y="119.23000000000002">Text &amp; Localis­ation Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="84" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="84" x="42" y="115.00000000000001">Text &amp; Localis­ation Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="textandloc_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Text &amp; Localis­ation Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="findutil_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Find Utility API</text>
+        </g>
+        <g id="japanese_language_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Japanese Language Utilities API</text>
+        </g>
+        <g id="sortutil_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Sorting Utility API</text>
+        </g>
+       </g>
+      </g>
+      <g id="textandloc_pub" transform="translate(30.000000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Text &amp; Localis­ation Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="directory_localizer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Directory Localizer API</text>
+        </g>
+       </g>
+      </g>
       <g id="charconvfw" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Character Conver­sion</text>
@@ -3533,7 +4877,7 @@
         </g>
        </g>
       </g>
-      <g id="textlayout" transform="translate(0 0)" class="collection">
+      <g id="textlayout" transform="translate(47.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Text Layout</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3622,35 +4966,54 @@
         </g>
        </g>
       </g>
-      <g id="textandloc_info" transform="translate(20.700000000000003 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Text &amp; Localis­ation Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="textandloc_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Text &amp; Localis­ation Public Inter­faces</text>
-        </g>
-        <g id="textandloc_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Text &amp; Localis­ation Platform Inter­faces</text>
-        </g>
+      <g id="textandloc_info" transform="translate(68.4 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Text &amp; Localis­ation Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="textandloc_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Text &amp; Localis­ation Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="xmlsrv" class="package" transform="translate( 1451.6999999999998 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Text &amp; Localis­ation Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="xmlsrv" class="package" transform="translate( 3723.8999999999987 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="65.1" height="120.23000000000002" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">XML Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="65.1" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="115.00000000000001">XML Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="xmlsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">XML Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="xmlsrv_plat_build" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">XML Services Platform Interface Build</text>
+        </g>
+        <g id="xml_encryption_api" class="component placeholder">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderround"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">XML Encryption API</text>
+        </g>
+        <g id="xml_signature_api" class="component placeholder">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderround"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">XML Signature API</text>
+        </g>
+        <g id="xml_security_engine_utils_api" class="component placeholder">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderround"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">XML Security Engine Utils API</text>
+        </g>
+       </g>
+      </g>
       <g id="xmlsecurityengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">XML Security Engine</text>
@@ -3718,29 +5081,24 @@
         </g>
        </g>
       </g>
-      <g id="xmlsrv_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">XML Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="xmlsrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">XML Services Platform Inter­faces</text>
-        </g>
+      <g id="xmlsrv_info" transform="translate(39.300000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">XML Services Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="xmlsrv_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">XML Services Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 1518.8999999999999 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">XML Services Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="deviceplatformrelease" class="package" transform="translate( 3791.0999999999985 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="196.5" height="120.23000000000002" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="196.5" x="98.25" y="119.23000000000002">Dev­ice Platform Release</text>
+     <rect class="package" x="0" width="196.5" height="116.00000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="196.5" x="98.25" y="115.00000000000001">Dev­ice Platform Release</text>
      <g transform="translate(0 3.2)">
       <g id="s60extras" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -3937,10 +5295,10 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 1717.4999999999998 0)">
+    <g id="osrndtools" class="package" transform="translate( 3989.6999999999985 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="162.29999999999998" height="120.23000000000002" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="162.29999999999998" x="81.14999999999999" y="119.23000000000002">OS R&amp;D tools</text>
+     <rect class="package" x="0" width="159.29999999999998" height="116.00000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="115.00000000000001">OS R&amp;D tools</text>
      <g transform="translate(0 3.2)">
       <g id="stif" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="139.5"/>
@@ -4142,20 +5500,14 @@
        </g>
       </g>
       <g id="osrndtools_info" transform="translate(143.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">OS R&amp;D tools Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="osrndtools_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderround"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">OS R&amp;D tools Platform Inter­faces</text>
-        </g>
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">OS R&amp;D tools Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="osrndtools_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">OS R&amp;D tools Metadata</text>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">OS R&amp;D tools Metadata</text>
         </g>
        </g>
       </g>
@@ -4165,16 +5517,188 @@
   </g>
  </g>
  <g id="mw" transform="translate(3.1999999999999993 173.83)" class="layer">
-  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="227.03"/>
-  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="227.03" height="9.3" x="-113.815">Middleware</text>
-  <g class="layer-detail" transform="translate(98.59999999999995 3.2)">
-   <rect x="-85.79999999999996" class="layer" y="-3.2" width="2418.6000000000004" height="227.03"/>
+  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
+  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
+  <g class="layer-detail" transform="translate(12.8 3.2)">
+   <rect x="0" class="layer" y="-3.2" width="5143.199999999998" height="222.8"/>
    <g>
-    <g id="appsupport" class="package" transform="translate( 0 104.63000000000001)">
+    <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="150.89999999999998" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="96.89999999999998" x="102.44999999999999" y="29.8" dy="0.375em">Generic App Support</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="355.80000000000024" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="301.80000000000024" x="204.90000000000012" y="29.8" dy="0.375em">Generic App Support</text>
+     <g transform="translate(0 3.2)">
+      <g id="appsupport_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Generic App Support Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="flash_viewer_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Flash Viewer Framework API</text>
+        </g>
+        <g id="network_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Network Status API</text>
+        </g>
+       </g>
+      </g>
+      <g id="appsupport_plat" transform="translate(20.700000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="279.00000000000017"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="277.6000000000002" height="6.299999999999999">Generic App Support Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="action_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Action Plug-In API</text>
+        </g>
+        <g id="application_orientation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Application Orientation API</text>
+        </g>
+        <g id="context_access_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Context Access API</text>
+        </g>
+        <g id="context_framework_services_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Context Framework Services API</text>
+        </g>
+        <g id="context_framework_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Context Framework Client API</text>
+        </g>
+        <g id="context_framework_listener_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Context Framework Listener API</text>
+        </g>
+        <g id="context_framework_version_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Context Framework Version API</text>
+        </g>
+        <g id="context_source_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Context Source Plug-In API</text>
+        </g>
+        <g id="context_source_settings_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Context Source Settings Manager API</text>
+        </g>
+        <g id="context_subscription_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Context Subscription API</text>
+        </g>
+        <g id="key_event_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Key Event Framework API</text>
+        </g>
+        <g id="key_event_framework_mapper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Key Event Framework Mapper API</text>
+        </g>
+        <g id="media_keys_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Media Keys Definition API</text>
+        </g>
+        <g id="ood_threshold_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">OOD Threshold API</text>
+        </g>
+        <g id="oom_monitor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">OOM Monitor API</text>
+        </g>
+        <g id="oom_monitor_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">OOM Monitor Plugin API</text>
+        </g>
+        <g id="operation_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Operation Provider API</text>
+        </g>
+        <g id="phonecmdhandler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Phone Command Handler API</text>
+        </g>
+        <g id="restore_factory_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Restore Factory Settings API</text>
+        </g>
+        <g id="restore_factory_settings_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Restore Factory Settings Plug-in API</text>
+        </g>
+        <g id="secondary_display_accfw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Secondary Display Accessory Framework API</text>
+        </g>
+        <g id="secondary_display_startup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Secondary Display Startup API</text>
+        </g>
+        <g id="secondary_display_sysap_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Secondary Display System Application API</text>
+        </g>
+        <g id="secondary_display_system_state_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Secondary Display System State API</text>
+        </g>
+        <g id="sensor_user_setting_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Sensor User Setting API</text>
+        </g>
+        <g id="startup_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Startup Configuration API</text>
+        </g>
+        <g id="system_application_key_handler_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">System Application Key Handler Plug-in API</text>
+        </g>
+        <g id="system_application_light_control_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">System Application Light Control Plug-in API</text>
+        </g>
+        <g id="system_application_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">System Application Notification API</text>
+        </g>
+        <g id="system_application_plugin_callback_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">System Application Plug-in Callback API</text>
+        </g>
+       </g>
+      </g>
       <g id="contextframework" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Context Frame­work</text>
@@ -4269,7 +5793,7 @@
         </g>
        </g>
       </g>
-      <g id="flashliteapi_3_1" transform="translate(0 0)" class="collection">
+      <g id="flashliteapi_3_1" transform="translate(301.8000000000002 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Flash Lite API 3.1</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4405,8 +5929,8 @@
        </g>
       </g>
       <g id="tzservices" transform="translate(17.7 75.2)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Time Zone Services</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Time Zone Services</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="tzserver" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -4423,9 +5947,14 @@
          <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Time Zone Localiz­ation Resource Factory</text>
         </g>
-       </g>
-      </g>
-      <g id="contenthandling" transform="translate(47.7 75.2)" class="collection">
+        <g id="tzdatabase" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Time Zone Database</text>
+        </g>
+       </g>
+      </g>
+      <g id="contenthandling" transform="translate(57.00000000000001 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Content Handling</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4436,7 +5965,7 @@
         </g>
        </g>
       </g>
-      <g id="openenvutils" transform="translate(17.7 0)" class="collection">
+      <g id="openenvutils" transform="translate(319.5000000000002 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Open Env. Utilities</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4497,7 +6026,7 @@
         </g>
        </g>
       </g>
-      <g id="tzpcside" transform="translate(65.4 75.2)" class="collection">
+      <g id="tzpcside" transform="translate(74.7 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Time Zone PC Side</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4508,35 +6037,121 @@
         </g>
        </g>
       </g>
-      <g id="appsupport_info" transform="translate(38.400000000000006 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Generic App Support Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="appsupport_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Generic App Support Platform Inter­faces</text>
-        </g>
-        <g id="appsupport_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Generic App Support Public Inter­faces</text>
-        </g>
+      <g id="appsupport_info" transform="translate(340.2000000000002 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Generic App Support Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="appsupport_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Generic App Support Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="securitysrv" class="package" transform="translate( 152.99999999999997 104.63000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Generic App Support Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="securitysrv" class="package" transform="translate( 357.90000000000026 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="112.8" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="112.8" x="56.4" y="115.00000000000001">Security Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="252.3" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="252.3" x="126.15" y="115.00000000000003">Security Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="secsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="167.40000000000003"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="166.00000000000003" height="6.299999999999999">Security Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="cms_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">CMS API</text>
+        </g>
+        <g id="pkcs12_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">PKCS12 Parser API</text>
+        </g>
+        <g id="java_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Java Utils API</text>
+        </g>
+        <g id="wim_cert_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">WIM Cert API</text>
+        </g>
+        <g id="device_key_store_encryption_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Device Key Store Encryption Plug-in API</text>
+        </g>
+        <g id="x509certnameparser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">X.509 Certificate Name Parser API</text>
+        </g>
+        <g id="remote_lock_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Remote Lock API</text>
+        </g>
+        <g id="pkidialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">PKI Dialog API</text>
+        </g>
+        <g id="provisioning_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Provisioning API</text>
+        </g>
+        <g id="keyguard_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Keyguard Configuration API</text>
+        </g>
+        <g id="keylock_policy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Keylock Policy API</text>
+        </g>
+        <g id="security_code_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Security Code UI API</text>
+        </g>
+        <g id="gba_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">GBA API</text>
+        </g>
+        <g id="keyguard_access_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Keyguard Access API</text>
+        </g>
+        <g id="devicelock_access_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Device Lock Access API</text>
+        </g>
+        <g id="lockapp_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Lock Application Server API</text>
+        </g>
+        <g id="devencadaptation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Device Encryption Adaptation API</text>
+        </g>
+        <g id="devenccommonutils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Device Encryption Common Utils API</text>
+        </g>
+       </g>
+      </g>
       <g id="cms" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Certificate Management Service</text>
@@ -4626,7 +6241,7 @@
         </g>
        </g>
       </g>
-      <g id="securitydialogs" transform="translate(0 0)" class="collection">
+      <g id="securitydialogs" transform="translate(169.50000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Security Dialogs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4740,30 +6355,122 @@
         </g>
        </g>
       </g>
-      <g id="securitysrv_info" transform="translate(67.19999999999999 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Security Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="secsrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Security Services Platform Inter­faces</text>
-        </g>
+      <g id="securitysrv_info" transform="translate(236.70000000000002 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Security Services Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="securitysrv_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Security Services Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="drm" class="package" transform="translate( 267.9 104.63000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Security Services Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="drm" class="package" transform="translate( 612.3000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="65.1" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="115.00000000000001">DRM</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="177.89999999999998" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="177.89999999999998" x="88.94999999999999" y="115.00000000000003">DRM</text>
+     <g transform="translate(0 3.2)">
+      <g id="drm_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">DRM Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="roap_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">ROAP API</text>
+        </g>
+        <g id="drm_common_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">DRM Common API</text>
+        </g>
+        <g id="drm_rights_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">DRM Rights API</text>
+        </g>
+        <g id="drm_legacy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">DRM Legacy API</text>
+        </g>
+        <g id="dcf_repository_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">DCF Repository API</text>
+        </g>
+        <g id="drm_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">DRM Service API</text>
+        </g>
+        <g id="drm_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">DRM Secondary Display API</text>
+        </g>
+        <g id="drm_license_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">DRM License Manager API</text>
+        </g>
+        <g id="drm_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">DRM Utility API</text>
+        </g>
+        <g id="drm_agents_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">DRM Agents API</text>
+        </g>
+        <g id="wmdrm_core_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">WM DRM Core API</text>
+        </g>
+        <g id="wmdrm_access_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">WMDRM Access API</text>
+        </g>
+        <g id="camese_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Camese Utility API</text>
+        </g>
+        <g id="camese_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Camese Framework API</text>
+        </g>
+       </g>
+      </g>
+      <g id="drm_pub" transform="translate(132.29999999999998 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">DRM Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="drm_helper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DRM Helper API</text>
+        </g>
+        <g id="oma_drm_caf_agent_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">OMA DRM CAF Agent API</text>
+        </g>
+        <g id="drm_license_checker_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">DRM License Checker API</text>
+        </g>
+       </g>
+      </g>
       <g id="commondrm" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Common DRM</text>
@@ -4835,29 +6542,170 @@
         </g>
        </g>
       </g>
-      <g id="drm_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">DRM Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="drm_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DRM Public Inter­faces</text>
-        </g>
-        <g id="drm_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">DRM Platform Inter­faces</text>
-        </g>
-       </g>
+      <g id="drm_info" transform="translate(162.29999999999998 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DRM Info</text>
+       <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
     <g id="locationsrv" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="129.29999999999998" height="101.43" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="129.29999999999998" x="64.64999999999999" y="100.43">Location Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="280.2000000000001" height="97.2" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="280.2000000000001" x="140.10000000000005" y="96.2">Location Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="locsrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Location Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="landmarks_search_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Landmarks Search API</text>
+        </g>
+        <g id="landmarks_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Landmarks API</text>
+        </g>
+        <g id="landmarks_database_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Landmarks Database Management API</text>
+        </g>
+        <g id="location_triggering_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Location Triggering API</text>
+        </g>
+        <g id="blid_application_satellite_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">BLID Application Satellite Info API</text>
+        </g>
+       </g>
+      </g>
+      <g id="locsrv_plat" transform="translate(48.6 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="213.9000000000001"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="212.50000000000009" height="6.299999999999999">Location Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="map_and_navigation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Map and Navigation API</text>
+        </g>
+        <g id="map_and_navigation_provider_discovery_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Map and Navigation Provider Discovery API</text>
+        </g>
+        <g id="geocoding_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Geocoding API</text>
+        </g>
+        <g id="map_image_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Map Image API</text>
+        </g>
+        <g id="map_and_navigation_aiw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Map and Navigation AIW API</text>
+        </g>
+        <g id="map_and_navigation_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Map and Navigation Provider API</text>
+        </g>
+        <g id="landmarks_category_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Landmarks Category Definition API</text>
+        </g>
+        <g id="supl_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">SUPL Settings API</text>
+        </g>
+        <g id="location_settings_launch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Location Settings Launch API</text>
+        </g>
+        <g id="map_image_conversion_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Map Image Conversion Plug-In API</text>
+        </g>
+        <g id="psy_configuration_ui_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">PSY Configuration UI Plug-in API</text>
+        </g>
+        <g id="np_proxy_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">NP Proxy Configuration API</text>
+        </g>
+        <g id="supl_terminal_initiation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">SUPL Terminal Initiation API</text>
+        </g>
+        <g id="location_notation_preferences_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Location Notation Preferences Settings API</text>
+        </g>
+        <g id="supl_settings_notifier_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">SUPL Settings Notifier Secondary Display API</text>
+        </g>
+        <g id="supl_network_initiation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">SUPL Network Initiation API</text>
+        </g>
+        <g id="privacy_notifiers_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Privacy Notifiers Secondary Display API</text>
+        </g>
+        <g id="oma_supl_configuration_parameter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">OMA SUPL Configuration Parameter API</text>
+        </g>
+        <g id="supl_query_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">SUPL Query Secondary Display API</text>
+        </g>
+        <g id="location_triggering_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Location Triggering Management API</text>
+        </g>
+        <g id="location_triggering_status_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Location Triggering Status Information API</text>
+        </g>
+        <g id="oma_supl_asn_codec_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">OMA SUPL ASN Codec Plugin API</text>
+        </g>
+        <g id="location_local_variation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Location Local Variation API</text>
+        </g>
+       </g>
+      </g>
       <g id="genericpositioningplugins" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Generic Positioning Plugins</text>
@@ -4911,7 +6759,7 @@
         </g>
        </g>
       </g>
-      <g id="locationsystemui" transform="translate(0 0)" class="collection">
+      <g id="locationsystemui" transform="translate(264.6000000000001 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location System UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5009,30 +6857,90 @@
         </g>
        </g>
       </g>
-      <g id="locationsrv_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Location Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="locsrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Services Platform Inter­faces</text>
-        </g>
-        <g id="locsrv_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Location Services Public Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="accesssec" class="package" transform="translate( 335.09999999999997 104.63000000000001)">
+     </g>
+    </g>
+    <g id="accesssec" class="package" transform="translate( 792.3000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="64.2" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="64.2" x="32.1" y="115.00000000000001">Access Security</text>
-     <g transform="translate(0 3.2)">
-      <g id="wlansecuritysettings" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="178.79999999999998" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="178.79999999999998" x="89.39999999999999" y="115.00000000000003">Access Security</text>
+     <g transform="translate(0 3.2)">
+      <g id="accesssec_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">Access Security Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wapi_security_settings_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">WAPI Security Settings UI API</text>
+        </g>
+        <g id="wep_security_settings_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">WEP Security Settings UI API</text>
+        </g>
+        <g id="wi-fi_protected_setup_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Wi-Fi Protected Setup UI API</text>
+        </g>
+        <g id="wlan_eap_settings_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">WLAN EAP Settings UI API</text>
+        </g>
+        <g id="wpa_security_settings_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">WPA Security Settings UI API</text>
+        </g>
+        <g id="eap_vpn_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">EAP VPN API</text>
+        </g>
+        <g id="eapsim_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">EAP-SIM DB API</text>
+        </g>
+        <g id="eap_type_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">EAP Type API</text>
+        </g>
+        <g id="eaptlspeap_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">EAP-TLS-PEAP DB API</text>
+        </g>
+        <g id="eapleap_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">LEAP DB API</text>
+        </g>
+        <g id="eapgtc_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">EAP-GTC DB API</text>
+        </g>
+        <g id="eapmschapv2_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">EAP-MSCHAPV2 DB API</text>
+        </g>
+        <g id="eapaka_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">EAP-AKA DB API</text>
+        </g>
+        <g id="wapi_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">WAPI DB API</text>
+        </g>
+       </g>
+      </g>
+      <g id="wlansecuritysettings" transform="translate(132.29999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">WLAN Security Settings</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5074,24 +6982,125 @@
         </g>
        </g>
       </g>
-      <g id="accesssec_info" transform="translate(48.6 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Access Security Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="accesssec_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Access Security Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="ipconnmgmt" class="package" transform="translate( 401.4 104.63000000000001)">
+     </g>
+    </g>
+    <g id="ipconnmgmt" class="package" transform="translate( 973.2000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="94.2" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="94.2" x="47.1" y="115.00000000000001">IP Connect­ivity Mgmt.</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="272.09999999999997" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="272.09999999999997" x="136.04999999999998" y="115.00000000000003">IP Connect­ivity Mgmt.</text>
+     <g transform="translate(0 3.2)">
+      <g id="ipcm_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="111.59999999999998"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="110.19999999999997" height="6.299999999999999">IP Connect­ivity Mgmt. Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="access_point_engine_misc_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Access Point Engine Misc API</text>
+        </g>
+        <g id="bearer_settings_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Bearer Settings Plugin API</text>
+        </g>
+        <g id="commsdat_wlan_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">CommsDat WLAN API</text>
+        </g>
+        <g id="connection_monitor_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Conn. Monitor Ext. API</text>
+        </g>
+        <g id="connection_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Connection UI Utilities API</text>
+        </g>
+        <g id="disconnect_dialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Disconnect Dialog API</text>
+        </g>
+        <g id="disconnect_dialog_disable_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Disconnect Dialog Disable API</text>
+        </g>
+        <g id="extended_connection_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Extended Connection Settings API</text>
+        </g>
+        <g id="mpm_default_connection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">MPM Default Connection API</text>
+        </g>
+        <g id="pdpcontextmanager2_reset_factory_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">PDP Context Manager 2 Reset Factory Settings API</text>
+        </g>
+        <g id="pdpcontextmanager2_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">PDP Context Manager 2 Settings API</text>
+        </g>
+        <g id="mpm_connect_screen_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">MPM Connect Screen API</text>
+        </g>
+       </g>
+      </g>
+      <g id="ipcm_pub" transform="translate(113.69999999999997 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">IP Connect­ivity Mgmt. Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="connection_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Connection Settings API</text>
+        </g>
+        <g id="access_point_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Access Point Engine API</text>
+        </g>
+        <g id="access_point_settings_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Access Point Settings Handler API</text>
+        </g>
+        <g id="data_connection_log_counters_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Data Connection Log Counters API</text>
+        </g>
+        <g id="connection_monitor_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Connection Monitor Server API</text>
+        </g>
+        <g id="connection_settings_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Connection Settings UI API</text>
+        </g>
+        <g id="agent_dialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Agent Dialog API</text>
+        </g>
+        <g id="extendedconnpref_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Extended Connection Preferences API</text>
+        </g>
+       </g>
+      </g>
       <g id="accesspointcontrol" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Access Point Control</text>
@@ -5198,7 +7207,7 @@
         </g>
        </g>
       </g>
-      <g id="connectionutilities" transform="translate(0 0)" class="collection">
+      <g id="connectionutilities" transform="translate(190.19999999999996 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Connec­tion Utilities</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5209,7 +7218,7 @@
         </g>
        </g>
       </g>
-      <g id="dbcreator" transform="translate(17.7 0)" class="collection">
+      <g id="dbcreator" transform="translate(207.89999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">DB Creator</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5241,34 +7250,45 @@
         </g>
        </g>
       </g>
-      <g id="ipconnmgmt_info" transform="translate(66.3 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">IP Connect­ivity Mgmt. Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="ipcm_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IP Connect­ivity Mgmt. Public Inter­faces</text>
-        </g>
-        <g id="ipcm_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">IP Connect­ivity Mgmt. Platform Inter­faces</text>
-        </g>
+      <g id="ipconnmgmt_info" transform="translate(256.49999999999994 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">IP Connect­ivity Mgmt. Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="ipcm_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">IP Connectivity Management Build</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="netprotocols" class="package" transform="translate( 497.7 104.63000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IP Connectivity Management Build</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="netprotocols" class="package" transform="translate( 1247.4 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="83.69999999999999" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="115.00000000000001">High-level Internet Protocols</text>
-     <g transform="translate(0 3.2)">
+     <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="115.00000000000003">High-level Internet Protocols</text>
+     <g transform="translate(0 3.2)">
+      <g id="netprotocols_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">High-level Internet Protocols Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="cookie_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Cookie Manager API</text>
+        </g>
+        <g id="http_cache_mgr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HTTP Cache Manager API</text>
+        </g>
+        <g id="http_filters_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HTTP Filters API</text>
+        </g>
+       </g>
+      </g>
       <g id="httpfilters" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">HTTP Filters</text>
@@ -5388,30 +7408,41 @@
         </g>
        </g>
       </g>
-      <g id="netprotocols_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">High-level Internet Protocols Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="netprotocols_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">High-level Internet Protocols Platform Inter­faces</text>
-        </g>
+      <g id="netprotocols_info" transform="translate(30.000000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">High-level Internet Protocols Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="netprotocols_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">High-level Internet Protocols Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="ipappprotocols" class="package" transform="translate( 583.5 104.63000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">High-level Internet Protocols Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="ipappprotocols" class="package" transform="translate( 1333.2 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="46.5" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="46.5" x="23.25" y="115.00000000000001">IP App Protocols</text>
-     <g transform="translate(0 3.2)">
+     <text text-anchor="middle" class="package" width="46.5" x="23.25" y="115.00000000000003">IP App Protocols</text>
+     <g transform="translate(0 3.2)">
+      <g id="ipappprotocols_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">IP App Protocols Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="srtp_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">SRTP API</text>
+        </g>
+        <g id="rtprtcp_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">RTP/RTCP API</text>
+        </g>
+       </g>
+      </g>
       <g id="rtp" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">RTP</text>
@@ -5486,30 +7517,51 @@
         </g>
        </g>
       </g>
-      <g id="ipappprotocols_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">IP App Protocols Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="ipappprotocols_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IP App Protocols Platform Inter­faces</text>
-        </g>
+      <g id="ipappprotocols_info" transform="translate(20.700000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">IP App Protocols Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="ipappprotocols_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">IP App Protocols Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="wirelessacc" class="package" transform="translate( 131.39999999999998 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IP App Protocols Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="wirelessacc" class="package" transform="translate( 282.3000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="65.1" height="101.43" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="100.43">Wireless Access</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="65.1" height="97.2" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="96.2">Wireless Access</text>
+     <g transform="translate(0 3.2)">
+      <g id="hsfw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">HotSpot FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="hotspot_framework_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HotSpot Framework Client API</text>
+        </g>
+        <g id="internet_connectivity_test_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Internet Connectivity Test Service API</text>
+        </g>
+        <g id="internet_connectivity_test_service_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Internet Connectivity Test Service Settings API</text>
+        </g>
+        <g id="hotspot_framework_client_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">HotSpot Framework Client Plugin API</text>
+        </g>
+       </g>
+      </g>
       <g id="hotspotfw" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">HotSpot Frame­work</text>
@@ -5583,25 +7635,25 @@
         </g>
        </g>
       </g>
-      <g id="wirelessacc_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Wireless Access Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="hsfw_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HotSpot FW Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="vpnclient" class="package" transform="translate( 198.59999999999997 0)">
+     </g>
+    </g>
+    <g id="vpnclient" class="package" transform="translate( 349.5000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="260.40000000000015" height="101.43" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="260.40000000000015" x="130.20000000000007" y="100.43">VPN Client</text>
-     <g transform="translate(0 3.2)">
-      <g id="vpnapiimpl" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="260.40000000000015" height="97.2" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="260.40000000000015" x="130.20000000000007" y="96.2">VPN Client</text>
+     <g transform="translate(0 3.2)">
+      <g id="vpnc_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">VPN Client Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="vpnapi" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">VPN API</text>
+        </g>
+       </g>
+      </g>
+      <g id="vpnapiimpl" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">VPN API Impl.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5789,9 +7841,9 @@
         </g>
        </g>
       </g>
-      <g id="vpnclient_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">VPN Client Info</text>
+      <g id="vpnclient_info" transform="translate(35.4 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">VPN Client Info</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="vpnclient_help" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -5803,20 +7855,51 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">VPN Client Build</text>
         </g>
-        <g id="vpnc_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">VPN Client Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="ipappsrv" class="package" transform="translate( 461.10000000000014 0)">
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="ipappsrv" class="package" transform="translate( 612.0000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="67.2" height="101.43" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="67.2" x="33.6" y="100.43">IP App Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="115.8" height="97.2" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="115.8" x="57.9" y="48.6" dy="0.375em">IP App Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="ipappsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">IP App Services Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="transcoder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Transcoder API</text>
+        </g>
+        <g id="comms_event_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Comms Event API</text>
+        </g>
+        <g id="floor_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Floor Control API</text>
+        </g>
+        <g id="media_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Media Control API</text>
+        </g>
+        <g id="multimedia_comms_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Multimedia Comms API</text>
+        </g>
+        <g id="nat_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">NAT Settings API</text>
+        </g>
+       </g>
+      </g>
       <g id="natfw" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">NAT Frame­work</text>
@@ -5850,7 +7933,7 @@
         </g>
        </g>
       </g>
-      <g id="natplugins" transform="translate(0 0)" class="collection">
+      <g id="natplugins" transform="translate(57.9 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">NAT Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5876,35 +7959,226 @@
         </g>
        </g>
       </g>
-      <g id="ipappsrv_info" transform="translate(39.300000000000004 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">IP App Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="ipappsrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IP App Services Platform Interfaces</text>
-        </g>
+      <g id="ipappsrv_info" transform="translate(97.2 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">IP App Services Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="ipappsrv_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">IP App Services Build</text>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IP App Services Build</text>
         </g>
         <g id="ipappsrv_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">IP App Services Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="phonesrv" class="package" transform="translate( 530.4000000000001 0)">
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">IP App Services Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="phonesrv" class="package" transform="translate( 729.9000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="95.1" height="101.43" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="95.1" x="47.55" y="100.43">Telephony &amp; SIM Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="409.50000000000034" height="97.2" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="373.20000000000033" x="222.90000000000018" y="86.2" dy="0.375em">Telephony &amp; SIM Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="phonesrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="353.40000000000026"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="352.0000000000003" height="6.299999999999999">Telephony &amp; SIM Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="string_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">String Parser API</text>
+        </g>
+        <g id="cbs_mcn_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">CBS MCN Client API</text>
+        </g>
+        <g id="converged_call_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Converged Call Engine API</text>
+        </g>
+        <g id="aiw_dial_data_consumer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">AIW Dial Data Consumer API</text>
+        </g>
+        <g id="phone_client_ussd_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Phone Client USSD API</text>
+        </g>
+        <g id="sat_refresh_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">SAT Refresh API</text>
+        </g>
+        <g id="network_handling_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Network Handling Engine API</text>
+        </g>
+        <g id="phone_client_emergency_call_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Phone Client Emergency Call API</text>
+        </g>
+        <g id="sat_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">SAT Configuration API</text>
+        </g>
+        <g id="dial_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Dial Utils API</text>
+        </g>
+        <g id="phone_client_image_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Phone Client Image Handler API</text>
+        </g>
+        <g id="phone_client_messenger_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Phone Client Messenger API</text>
+        </g>
+        <g id="sat_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">SAT Client API</text>
+        </g>
+        <g id="phone_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Phone Client API</text>
+        </g>
+        <g id="sat_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">SAT Service API</text>
+        </g>
+        <g id="cbs_message_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">CBS Message API</text>
+        </g>
+        <g id="phone_client_server_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Phone Client Server Information API</text>
+        </g>
+        <g id="phone_client_ussd_internal_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Phone Client USSD Internal API</text>
+        </g>
+        <g id="phone_client_command_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Phone Client Command Handler API</text>
+        </g>
+        <g id="phone_client_notify_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Phone Client Notify API</text>
+        </g>
+        <g id="phone_client_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Phone Client Utility API</text>
+        </g>
+        <g id="telephony_network_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Telephony Network Information API</text>
+        </g>
+        <g id="secondary_display_sat_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Secondary Display SAT API</text>
+        </g>
+        <g id="callui_reconnect_query_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">CallUI Reconnect Query API</text>
+        </g>
+        <g id="service_provider_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Service Provider Settings API</text>
+        </g>
+        <g id="converged_call_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Converged Call Provider API</text>
+        </g>
+        <g id="incoming_call_monitor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Incoming Call Monitor API</text>
+        </g>
+        <g id="default_emergency_numbers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Default Emergency Numbers API</text>
+        </g>
+        <g id="cenrep_database_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Central Repository Database API</text>
+        </g>
+        <g id="ss_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">SS Settings API</text>
+        </g>
+        <g id="phone_settings_observer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Phone Settings Observer API</text>
+        </g>
+        <g id="phone_settings_notes_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Phone Settings Notes UI API</text>
+        </g>
+        <g id="phone_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">Phone Settings API</text>
+        </g>
+        <g id="voice_mailbox_number_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Voice Mailbox Number API</text>
+        </g>
+        <g id="voice_mailbox_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Voice Mailbox Settings API</text>
+        </g>
+        <g id="call_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">Call Information API</text>
+        </g>
+        <g id="call_remote_party_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">Call Remote Party Information API</text>
+        </g>
+        <g id="telephony_mediator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Telephony Mediator API</text>
+        </g>
+       </g>
+      </g>
       <g id="telutils" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Telephony Utils</text>
@@ -5999,7 +8273,7 @@
         </g>
        </g>
       </g>
-      <g id="engines" transform="translate(0 0)" class="collection">
+      <g id="engines" transform="translate(355.5000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Telephony Engines</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6068,7 +8342,7 @@
         </g>
        </g>
       </g>
-      <g id="satui" transform="translate(17.7 0)" class="collection">
+      <g id="satui" transform="translate(373.2000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">SIM App Toolkit UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6095,29 +8369,60 @@
         </g>
        </g>
       </g>
-      <g id="phonesrv_info" transform="translate(38.400000000000006 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Telephony &amp; SIM Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="phonesrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Telephony &amp; SIM Services Platform Inter­faces</text>
-        </g>
-        <g id="phonesrv_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Telephony &amp; SIM Services Public Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="messagingmw" class="package" transform="translate( 627.6 0)">
+      <g id="phonesrv_info" transform="translate(393.9000000000003 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony &amp; SIM Services Info</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+     </g>
+    </g>
+    <g id="messagingmw" class="package" transform="translate( 1141.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="147.89999999999998" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="147.89999999999998" x="73.94999999999999" y="100.43">Messag­ing Middle­ware</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="147.89999999999998" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="147.89999999999998" x="73.94999999999999" y="96.2">Messag­ing Middle­ware</text>
+     <g transform="translate(0 3.2)">
+      <g id="msgfw_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Msg. Middle­ware Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="send_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Send UI API</text>
+        </g>
+       </g>
+      </g>
+      <g id="msgfw_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Msg. Middle­ware Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="always_online_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Always Online Plugin API</text>
+        </g>
+        <g id="always_online_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Always Online Client API</text>
+        </g>
+        <g id="msg_common_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Messaging Common Utils API</text>
+        </g>
+        <g id="send_ui_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Send UI Plug-in API</text>
+        </g>
+        <g id="send_ui_datautils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Send UI Data Utils API</text>
+        </g>
+       </g>
+      </g>
       <g id="msgbranched" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Messag­ing Branched</text>
@@ -6207,35 +8512,161 @@
         </g>
        </g>
       </g>
-      <g id="messagingmw_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Msg. Middle­ware Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="msgfw_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Msg. Middle­ware Platform Inter­faces</text>
-        </g>
-        <g id="msgfw_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Msg. Middle­ware Public Inter­faces</text>
-        </g>
+      <g id="messagingmw_info" transform="translate(66.3 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Msg. Middle­ware Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="messagingmw_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Msg. Middle­ware Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="imsrv" class="package" transform="translate( 777.6 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Msg. Middle­ware Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="imsrv" class="package" transform="translate( 1291.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="55.8" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="100.43">Instant Msg. &amp; Presence Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="259.50000000000017" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="259.50000000000017" x="129.75000000000009" y="86.2" dy="0.375em">Instant Msg. &amp; Presence Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="imsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="241.80000000000013"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="240.40000000000012" height="6.299999999999999">Instant Msg. &amp; Presence Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="ximp_core_data_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">XIMP Core Data Model API</text>
+        </g>
+        <g id="ximp_presence_protocol_plugin_host_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">XIMP Presence Protocol Plug-in Host API</text>
+        </g>
+        <g id="ximp_presence_data_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">XIMP Presence Data Model API</text>
+        </g>
+        <g id="ximp_presence_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">XIMP Presence Protocol Plug-in API</text>
+        </g>
+        <g id="ximp_presence_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">XIMP Presence Management API</text>
+        </g>
+        <g id="ximp_core_protocol_plugin_host_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">XIMP Core Protocol Plug-in Host API</text>
+        </g>
+        <g id="ximp_core_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">XIMP Core Management API</text>
+        </g>
+        <g id="ximp_presence_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">XIMP Presence Base API</text>
+        </g>
+        <g id="ximp_core_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">XIMP Core Protocol Plug-in API</text>
+        </g>
+        <g id="ximp_core_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">XIMP Core Base API</text>
+        </g>
+        <g id="ximp_presence_cache_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">XIMP Presence Cache API</text>
+        </g>
+        <g id="ximp_core_feature_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">XIMP Core Feature Plugin API</text>
+        </g>
+        <g id="ximp_im_protocol_plugin_host_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">XIMP IM Protocol Plugin Host API</text>
+        </g>
+        <g id="ximp_im_data_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">XIMP IM Data Model API</text>
+        </g>
+        <g id="ximp_im_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">XIMP IM Protocol Plugin API</text>
+        </g>
+        <g id="ximp_im_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">XIMP IM Management API</text>
+        </g>
+        <g id="ximp_im_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">XIMP IM Base API</text>
+        </g>
+        <g id="ximp_search_protocol_plugin_host_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">XIMP Search Protocol Plugin Host API</text>
+        </g>
+        <g id="ximp_search_data_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">XIMP Search Data Model API</text>
+        </g>
+        <g id="ximp_search_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">XIMP search Protocol Plugin API</text>
+        </g>
+        <g id="ximp_search_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">XIMP Search Management API</text>
+        </g>
+        <g id="ximp_search_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">XIMP Search Base API</text>
+        </g>
+        <g id="xmpp_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">XMPP Settings API</text>
+        </g>
+        <g id="im_cache_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">IM Cache Client API</text>
+        </g>
+        <g id="im_cache_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">IM Cache Server API</text>
+        </g>
+        <g id="presence_avabilitytext" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Presence Avability Text</text>
+        </g>
+       </g>
+      </g>
       <g id="ximpfw" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">XIMP Frame­work</text>
@@ -6283,7 +8714,7 @@
         </g>
        </g>
       </g>
-      <g id="brandingserver" transform="translate(0 0)" class="collection">
+      <g id="brandingserver" transform="translate(243.90000000000012 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Branding Server</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6294,24 +8725,84 @@
         </g>
        </g>
       </g>
-      <g id="imsrv_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Instant Msg. &amp; Presence Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="imsrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Instant Msg. &amp; Presence Services Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="legacypresence" class="package" transform="translate( 835.5 0)">
+     </g>
+    </g>
+    <g id="legacypresence" class="package" transform="translate( 1553.1000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.43">Legacy Presence Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="156.29999999999995" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="156.29999999999995" x="78.14999999999998" y="96.2">Legacy Presence Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="pressrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="120.89999999999998"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="119.49999999999997" height="6.299999999999999">Legacy Presence Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="presence_list_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Presence List API</text>
+        </g>
+        <g id="watcher_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Watcher Info API</text>
+        </g>
+        <g id="simple_documents_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SIMPLE Documents API</text>
+        </g>
+        <g id="authorization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Authorization API</text>
+        </g>
+        <g id="xdm_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">XDM Protocol Plug-in API</text>
+        </g>
+        <g id="watcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Watcher API</text>
+        </g>
+        <g id="xdm_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">XDM API</text>
+        </g>
+        <g id="registration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Registration API</text>
+        </g>
+        <g id="publisher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Publisher API</text>
+        </g>
+        <g id="messaging_connection_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Messaging Connection Manager API</text>
+        </g>
+        <g id="xdm_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">XDM Settings API</text>
+        </g>
+        <g id="simple_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">SIMPLE Settings API</text>
+        </g>
+        <g id="simple_instant_msg_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Simple Instant Msg API</text>
+        </g>
+       </g>
+      </g>
       <g id="xdmengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">XDM Engine</text>
@@ -6323,7 +8814,7 @@
         </g>
        </g>
       </g>
-      <g id="xdmsettingsui" transform="translate(0 0)" class="collection">
+      <g id="xdmsettingsui" transform="translate(122.99999999999997 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">XDM Settings UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6356,7 +8847,7 @@
         </g>
        </g>
       </g>
-      <g id="presencesettingsui" transform="translate(17.7 0)" class="collection">
+      <g id="presencesettingsui" transform="translate(140.69999999999996 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Presence Settings UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6400,24 +8891,24 @@
         </g>
        </g>
       </g>
-      <g id="legacypresence_info" transform="translate(35.4 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Legacy Presence Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="pressrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Legacy Presence Services Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="opensrv" class="package" transform="translate( 906.3 0)">
+     </g>
+    </g>
+    <g id="opensrv" class="package" transform="translate( 1711.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Open Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Open Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="opensrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Open Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="messagequeue_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Message Queue API</text>
+        </g>
+       </g>
+      </g>
       <g id="loudmouth" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Loud­mouth</text>
@@ -6440,7 +8931,7 @@
         </g>
        </g>
       </g>
-      <g id="telepathygabble" transform="translate(0 0)" class="collection">
+      <g id="telepathygabble" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Telepathy Gabble</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6472,24 +8963,220 @@
         </g>
        </g>
       </g>
-      <g id="opensrv_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Open Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="opensrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Open Services Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="remotemgmt" class="package" transform="translate( 941.6999999999999 0)">
+     </g>
+    </g>
+    <g id="remotemgmt" class="package" transform="translate( 1746.9000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
-     <rect class="package" x="0" width="87.89999999999999" height="101.43" y="0" style="fill:darkseagreen;"/>
-     <text text-anchor="middle" class="package" width="87.89999999999999" x="43.949999999999996" y="100.43">Remote Manage­ment</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="440.4000000000003" height="97.2" y="0" style="fill:darkseagreen;"/>
+     <text text-anchor="middle" class="package" width="440.4000000000003" x="220.20000000000016" y="86.2" dy="0.375em">Remote Manage­ment</text>
+     <g transform="translate(0 3.2)">
+      <g id="remotemgmt_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Remote Mgmt. Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="synchronization_capability_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Synchronization Capability API</text>
+        </g>
+       </g>
+      </g>
+      <g id="remotemgmt_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="353.40000000000026"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="352.0000000000003" height="6.299999999999999">Remote Mgmt. Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="common_agent_util_and_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Common Agent util and definitions API</text>
+        </g>
+        <g id="policy_management_certificate_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Policy Management Certificate API</text>
+        </g>
+        <g id="oma_provisioning_adapter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">OMA Provisioning Adapter API</text>
+        </g>
+        <g id="device_management_parameter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Device Management Parameter API</text>
+        </g>
+        <g id="data_synchronization_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Data Synchronization Plug-in API</text>
+        </g>
+        <g id="sync_alert_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Sync Alert Handler API</text>
+        </g>
+        <g id="syncml_notifier_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">SyncML Notifier API</text>
+        </g>
+        <g id="syncml_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">SyncML Client API</text>
+        </g>
+        <g id="device_management_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Device Management plug-in API</text>
+        </g>
+        <g id="dm_tree_apis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">DM Tree APIs</text>
+        </g>
+        <g id="terminal_security_device_lock_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Terminal Security Device Lock API</text>
+        </g>
+        <g id="policy_management_request_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Policy Management Request API</text>
+        </g>
+        <g id="ds_constant_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">DS Constant Definitions API</text>
+        </g>
+        <g id="scp_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">SCP Server API</text>
+        </g>
+        <g id="data_synchronization_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Data Synchronization Notification API</text>
+        </g>
+        <g id="oma_provisioning_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">OMA Provisioning Engine API</text>
+        </g>
+        <g id="dm_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">DM Utils API</text>
+        </g>
+        <g id="syncml_alert_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">SyncML Alert API</text>
+        </g>
+        <g id="obex_client_session_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">OBEX Client session API</text>
+        </g>
+        <g id="setting_enforcement_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Setting Enforcement Info API</text>
+        </g>
+        <g id="dm_constant_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">DM Constant Definitions API</text>
+        </g>
+        <g id="oma_ds_extensions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">OMA DS Extensions API</text>
+        </g>
+        <g id="pnpms_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">PNPMS Utils API</text>
+        </g>
+        <g id="diagnostics_plugin_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Diagnostics Plugin Utility API</text>
+        </g>
+        <g id="diagnostics_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Diagnostics Plug-in API</text>
+        </g>
+        <g id="diagnostics_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Diagnostics Framework API</text>
+        </g>
+        <g id="diagnostics_results_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Diagnostics Results API</text>
+        </g>
+        <g id="diagnostics_plugin_pool_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Diagnostics Plugin Pool API</text>
+        </g>
+        <g id="adaptive_history_list_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Adaptive History List API</text>
+        </g>
+        <g id="adaptive_history_list_session_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Adaptive History List Session API</text>
+        </g>
+        <g id="fota_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">FOTA Engine API</text>
+        </g>
+        <g id="update_package_storage_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Update Package Storage Plug-in API</text>
+        </g>
+        <g id="syncml_notifier_roaming_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">SyncML Notifier Roaming API</text>
+        </g>
+        <g id="sync_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Sync Service API</text>
+        </g>
+        <g id="dcmo_adapter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">DCMO Adapter API</text>
+        </g>
+        <g id="dcmo_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">DCMO Control API</text>
+        </g>
+        <g id="ds_capability_mgmt_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">DS Capability Management Plugin API</text>
+        </g>
+        <g id="dm_native_notifier_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">DM Native Notifier API</text>
+        </g>
+       </g>
+      </g>
       <g id="policymanagement" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Policy Manage­ment</text>
@@ -6527,7 +9214,7 @@
         </g>
        </g>
       </g>
-      <g id="terminalsecurity" transform="translate(0 0)" class="collection">
+      <g id="terminalsecurity" transform="translate(373.2000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Terminal Security</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6558,7 +9245,7 @@
         </g>
        </g>
       </g>
-      <g id="omaprovisioning" transform="translate(48.6 0)" class="collection">
+      <g id="omaprovisioning" transform="translate(421.8000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">OMA Provision­ing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6649,29 +9336,24 @@
         </g>
        </g>
       </g>
-      <g id="remotemgmt_info" transform="translate(69.3 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Remote Mgmt. Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="remotemgmt_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Remote Mgmt. Platform Inter­faces</text>
-        </g>
-        <g id="remotemgmt_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Remote Mgmt. Public Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="remotestorage" class="package" transform="translate( 632.1 104.63000000000001)">
+     </g>
+    </g>
+    <g id="remotestorage" class="package" transform="translate( 1381.8 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="83.69999999999999" height="116.00000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="115.00000000000001">Remote Storage</text>
-     <g transform="translate(0 3.2)">
+     <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="115.00000000000003">Remote Storage</text>
+     <g transform="translate(0 3.2)">
+      <g id="rsfw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Remote Storage Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="rsfw_access_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Remote Storage Framework Access Protocol Plugin API</text>
+        </g>
+       </g>
+      </g>
       <g id="remotestoragefw" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Remote Storage Fmwk.</text>
@@ -6725,23 +9407,12 @@
         </g>
        </g>
       </g>
-      <g id="remotestorage_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Remote Storage Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="rsfw_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Remote Storage Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="remoteconn" class="package" transform="translate( 717.9 104.63000000000001)">
+     </g>
+    </g>
+    <g id="remoteconn" class="package" transform="translate( 1467.6 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="48.6" height="116.00000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="48.6" x="24.3" y="115.00000000000001">Remote Connect­ivity</text>
+     <text text-anchor="middle" class="package" width="48.6" x="24.3" y="115.00000000000003">Remote Connect­ivity</text>
      <g transform="translate(0 3.2)">
       <g id="connectivitymodules" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -6755,19 +9426,14 @@
        </g>
       </g>
       <g id="remoteconn_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Remote Connect­ivity Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="remoteconn_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Remote Connect­ivity Platform Inter­faces</text>
-        </g>
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Remote Connect­ivity Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="remoteconn_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Remote Connect­ivity Metadata</text>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Remote Connect­ivity Metadata</text>
         </g>
        </g>
       </g>
@@ -6824,7 +9490,7 @@
         </g>
        </g>
       </g>
-      <g id="backupandrestore" transform="translate(20.700000000000003 0)" class="collection">
+      <g id="backupandrestore" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Backup &amp; Restore</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6859,11 +9525,47 @@
       </g>
      </g>
     </g>
-    <g id="srvdiscovery" class="package" transform="translate( 768.6 104.63000000000001)">
+    <g id="srvdiscovery" class="package" transform="translate( 1518.3 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000001">Service Discovery &amp; Usage</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="73.49999999999999" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="73.49999999999999" x="36.74999999999999" y="115.00000000000003">Service Discovery &amp; Usage</text>
+     <g transform="translate(0 3.2)">
+      <g id="upnpstack_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">UPnP Stack Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="upnpstack_plat" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UPnP Device API</text>
+        </g>
+        <g id="upnpstack_plat" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">UPnP Common API</text>
+        </g>
+        <g id="upnpstack_plat" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">UPnP Utils API</text>
+        </g>
+        <g id="upnpstack_plat" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">UPnP Control Point API</text>
+        </g>
+        <g id="upnpstack_plat" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">UPnP HTTP Server API</text>
+        </g>
+        <g id="upnpstack_plat" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">UPnP HTTP Transfer API</text>
+        </g>
+       </g>
+      </g>
       <g id="servicediscoveryandcontrol" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Service Discovery &amp; Control</text>
@@ -6876,22 +9578,17 @@
        </g>
       </g>
       <g id="upnp" transform="translate(0 37.6)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">UPnP</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="upnpstack_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UPnP Stack Platform Interfaces</text>
-        </g>
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">UPnP</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="upnpstack" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">UPnP Stack</text>
-        </g>
-       </g>
-      </g>
-      <g id="srvdiscovery_info" transform="translate(0 0)" class="collection">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UPnP Stack</text>
+        </g>
+       </g>
+      </g>
+      <g id="srvdiscovery_info" transform="translate(57.9 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Service Discovery &amp; Usage Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6905,12 +9602,58 @@
       </g>
      </g>
     </g>
-    <g id="dlnasrv" class="package" transform="translate( 1031.6999999999998 0)">
+    <g id="dlnasrv" class="package" transform="translate( 2189.400000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="159.29999999999998" height="101.43" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="100.43">DLNA Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="upnpavcontrolpoint" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="159.29999999999998" height="97.2" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="86.2" dy="0.375em">DLNA Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="dlnasrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">DLNA Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="upnp_media_server_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UPnP Media Server Settings API</text>
+        </g>
+        <g id="upnp_av_objects_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">UPnP A/V Objects API</text>
+        </g>
+        <g id="upnp_media_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">UPnP Media Server API</text>
+        </g>
+        <g id="upnp_security_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">UPnP Security Plugin API</text>
+        </g>
+        <g id="upnp_avcp_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">UPnP AVCP API</text>
+        </g>
+        <g id="upnp_media_server_metadata_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">UPnP Media Server Metadata API</text>
+        </g>
+        <g id="upnp_command_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">UPnP Command API</text>
+        </g>
+        <g id="upnp_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">UPnP Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="upnpavcontrolpoint" transform="translate(76.49999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">UPnP A/V Control Point</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7119,7 +9862,7 @@
         </g>
        </g>
       </g>
-      <g id="upnpmpxplugins" transform="translate(20.700000000000003 0)" class="collection">
+      <g id="upnpmpxplugins" transform="translate(97.2 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">UPnP MPX Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7165,7 +9908,7 @@
         </g>
        </g>
       </g>
-      <g id="homesync" transform="translate(41.400000000000006 0)" class="collection">
+      <g id="homesync" transform="translate(117.89999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Home Sync</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7189,29 +9932,111 @@
         </g>
        </g>
       </g>
-      <g id="dlnasrv_info" transform="translate(59.10000000000001 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">DLNA Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="dlnasrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DLNA Services Platform Inter­faces</text>
-        </g>
+      <g id="dlnasrv_info" transform="translate(135.6 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">DLNA Services Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="dlnasrv_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">DLNA Services Build</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="btservices" class="package" transform="translate( 798.6 104.63000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DLNA Services Build</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="btservices" class="package" transform="translate( 1593.8999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="102.29999999999998" height="116.00000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="102.29999999999998" x="51.14999999999999" y="115.00000000000001">Blue­tooth Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="176.99999999999997" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="176.99999999999997" x="88.49999999999999" y="115.00000000000003">Blue­tooth Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="btservices_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">BT Services Public Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="bluetooth_power_state_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Bluetooth Power State API</text>
+        </g>
+        <g id="bluetooth_notifier_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Bluetooth Notifier API</text>
+        </g>
+       </g>
+      </g>
+      <g id="btservices_plat" transform="translate(20.700000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="120.89999999999998"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="119.49999999999997" height="6.299999999999999">BT Services Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="bluetooth_dosserver_audio_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Bluetooth DOS Server Audio API</text>
+        </g>
+        <g id="bluetooth_dut_mode_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Bluetooth DUT Mode API</text>
+        </g>
+        <g id="bluetooth_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Bluetooth Engine API</text>
+        </g>
+        <g id="bluetooth_engine_connection_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Bluetooth Engine Connection Management API</text>
+        </g>
+        <g id="bluetooth_engine_device_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Bluetooth Engine Device Management API</text>
+        </g>
+        <g id="bluetooth_engine_discovery_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Bluetooth Engine Discovery API</text>
+        </g>
+        <g id="bluetooth_engine_features_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Bluetooth Engine Features API</text>
+        </g>
+        <g id="bluetooth_engine_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Bluetooth Engine Settings API</text>
+        </g>
+        <g id="bluetooth_engine_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Bluetooth Engine Plugin API</text>
+        </g>
+        <g id="bluetooth_local_variation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Bluetooth Local Variation API</text>
+        </g>
+        <g id="bluetooth_notifier_internal_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Bluetooth Notifier internal API</text>
+        </g>
+        <g id="bluetooth_sap_connection_state_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Bluetooth SAP Connection State API</text>
+        </g>
+        <g id="bluetooth_secondary_display_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Bluetooth Secondary Display Notification API</text>
+        </g>
+       </g>
+      </g>
       <g id="bluetoothengine" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Blue­tooth Engine</text>
@@ -7273,7 +10098,7 @@
         </g>
        </g>
       </g>
-      <g id="bluetoothappprofiles" transform="translate(0 0)" class="collection">
+      <g id="bluetoothappprofiles" transform="translate(143.69999999999996 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Btooth. App Profiles</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7284,45 +10109,85 @@
         </g>
        </g>
       </g>
-      <g id="btservices_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">BT Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="btservices_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">BT Services Platform Interfaces</text>
-        </g>
-        <g id="btservices_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">BT Services Public Interfaces</text>
-        </g>
+      <g id="btservices_info" transform="translate(161.39999999999998 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">BT Services Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="btservices_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">BT Services Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="usbservices" class="package" transform="translate( 903 104.63000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">BT Services Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="usbservices" class="package" transform="translate( 1772.9999999999998 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="46.5" height="116.00000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="46.5" x="23.25" y="115.00000000000001">USB Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="usbservices_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">USB Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="usbservices_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">USB Services Platform Interfaces</text>
-        </g>
-       </g>
+     <rect class="package" x="0" width="110.69999999999997" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="110.69999999999997" x="55.34999999999999" y="115.00000000000003">USB Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="usbservices_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="92.99999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="91.59999999999998" height="6.299999999999999">USB Services Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="pictbridge_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">PictBridge API</text>
+        </g>
+        <g id="ptp_responder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">PTP Responder API</text>
+        </g>
+        <g id="ptp_transport_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">PTP Transport API</text>
+        </g>
+        <g id="usb_device_control_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">USB Device Control Plug-in API</text>
+        </g>
+        <g id="usb_notifier_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">USB Notifier API</text>
+        </g>
+        <g id="usb_personality_api_header" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">USB Personality API</text>
+        </g>
+        <g id="usb_personality_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">USB Personality Plug-in API</text>
+        </g>
+        <g id="usb_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">USB Secondary Display API</text>
+        </g>
+        <g id="usb_watcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">USB Watcher API</text>
+        </g>
+        <g id="usb_watcher_info_api_header" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">USB Watcher Info API</text>
+        </g>
+       </g>
+      </g>
+      <g id="usbservices_info" transform="translate(95.09999999999998 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Services Info</text>
+       <g transform="translate(0 6.299999999999999)"/>
       </g>
       <g id="usbengines" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
@@ -7387,8 +10252,8 @@
        </g>
       </g>
       <g id="usbuis" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">USB UIs</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">USB UIs</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="usbui" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -7410,20 +10275,61 @@
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Image­Print UI</text>
         </g>
-        <g id="rndisui" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Remote NDIS UI</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="shortlinkconn" class="package" transform="translate( 951.6 104.63000000000001)">
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="shortlinkconn" class="package" transform="translate( 1885.7999999999997 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="102.29999999999998" height="116.00000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="102.29999999999998" x="51.14999999999999" y="115.00000000000001">Shortlink Connectivity</text>
-     <g transform="translate(0 3.2)">
+     <text text-anchor="middle" class="package" width="102.29999999999998" x="51.14999999999999" y="115.00000000000003">Shortlink Connectivity</text>
+     <g transform="translate(0 3.2)">
+      <g id="shortlinkconn_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Shortlink Connectivity Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="obex_service_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">OBEX Service Utils API</text>
+        </g>
+        <g id="obex_service_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">OBEX Service Plugin API</text>
+        </g>
+        <g id="dialup_connection_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Dial-up Connection Status API</text>
+        </g>
+        <g id="dun_secondary_display_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">DUN Secondary Display Notification API</text>
+        </g>
+        <g id="obex_secondary_display_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">OBEX Secondary Display Notification API</text>
+        </g>
+        <g id="generic_hid_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Generic HID API</text>
+        </g>
+        <g id="locod_bearer_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Locod Bearer Plugin API</text>
+        </g>
+        <g id="usb_obexservicemanager_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">USB OBEX Service Manager Client API</text>
+        </g>
+       </g>
+      </g>
       <g id="localconnectivityservice" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Local Connectivity Service</text>
@@ -7485,24 +10391,34 @@
         </g>
        </g>
       </g>
-      <g id="shortlinkconn_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Shortlink Connectivity Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="shortlinkconn_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Shortlink Connectivity Platform Interfaces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="imghandling" class="package" transform="translate( 1193.1 0)">
+     </g>
+    </g>
+    <g id="imghandling" class="package" transform="translate( 2350.800000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Image Handling</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Image Handling</text>
+     <g transform="translate(0 3.2)">
+      <g id="imagehandling_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Image Handling Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="image_handling_library_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Image Handling Library API</text>
+        </g>
+        <g id="3gp_library_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">3GP Library API</text>
+        </g>
+        <g id="thumbnailmanager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Thumbnail Manager API</text>
+        </g>
+       </g>
+      </g>
       <g id="imagehandlinglib" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Image Handling Library</text>
@@ -7525,24 +10441,50 @@
         </g>
        </g>
       </g>
-      <g id="imghandling_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Image Handling Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="imagehandling_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Image Handling Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="metadatasrv" class="package" transform="translate( 1223.1 0)">
+     </g>
+    </g>
+    <g id="metadatasrv" class="package" transform="translate( 2380.800000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Legacy Metadata Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="48.6" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="48.6" x="24.3" y="86.2" dy="0.375em">Legacy Metadata Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="metadatasrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Legacy Metadata Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="content_listing_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Content Listing Framework API</text>
+        </g>
+        <g id="media_fetch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Media Fetch API</text>
+        </g>
+       </g>
+      </g>
+      <g id="metadatasrv_plat" transform="translate(20.700000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Legacy Metadata Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="media_fetch_implementation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Media Fetch Implementation API</text>
+        </g>
+        <g id="content_listing_framework_collection_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Content Listing Framework Collection Manager API</text>
+        </g>
+        <g id="content_listing_framework_extended_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Content Listing Framework Extended API</text>
+        </g>
+       </g>
+      </g>
       <g id="mediamanagementutilities" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Media Mgmt. Utilities</text>
@@ -7554,29 +10496,60 @@
         </g>
        </g>
       </g>
-      <g id="metadatasrv_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Legacy Metadata Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="metadatasrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Legacy Metadata Services Platform Inter­faces</text>
-        </g>
-        <g id="metadatasrv_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Legacy Metadata Services Public Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="mds" class="package" transform="translate( 1253.1 0)">
+     </g>
+    </g>
+    <g id="mds" class="package" transform="translate( 2431.500000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="143.7" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="143.7" x="71.85" y="100.43">Metadata Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="143.7" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="143.7" x="71.85" y="96.2">Metadata Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="mds_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Metadata Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="context_engine_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Context Engine Plugin API</text>
+        </g>
+        <g id="harvester_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Harvester Framework API</text>
+        </g>
+        <g id="location_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Location Manager API</text>
+        </g>
+        <g id="metadata_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Metadata Engine API</text>
+        </g>
+        <g id="content_listing_framework_collection_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Content Listing Framework Collection Manager API</text>
+        </g>
+        <g id="content_listing_framework_extended_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Content Listing Framework Extended API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mds_pub" transform="translate(57.9 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Metadata Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="content_listing_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Content Listing Framework API</text>
+        </g>
+       </g>
+      </g>
       <g id="metadataengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Metadata Engine</text>
@@ -7707,7 +10680,7 @@
         </g>
        </g>
       </g>
-      <g id="clfwrapper" transform="translate(0 0)" class="collection">
+      <g id="clfwrapper" transform="translate(75.6 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Content Listing FW Wrapper</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7719,51 +10692,122 @@
         </g>
        </g>
       </g>
-      <g id="mds_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Metadata Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="mds_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Metadata Services Public Inter­faces</text>
-        </g>
-        <g id="mds_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Metadata Services Platform Inter­faces</text>
-        </g>
+      <g id="mds_info" transform="translate(93.29999999999998 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Metadata Services Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="mds_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Metadata Services Build</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="mmuifw" class="package" transform="translate( 1398.8999999999999 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Metadata Services Build</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="mmuifw" class="package" transform="translate( 2577.300000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="122.1" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="122.1" x="61.05" y="100.43">Multi­media UI Fmwk.</text>
-     <g transform="translate(0 3.2)">
-      <g id="mmuifw_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Multi­media UI Fmwk. Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="mmuifw_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">MM UI FW Platform Inter­faces</text>
-        </g>
+     <rect class="package" x="0" width="148.8" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="148.8" x="74.4" y="86.2" dy="0.375em">Multi­media UI Fmwk.</text>
+     <g transform="translate(0 3.2)">
+      <g id="mmuifw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="148.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="147.4" height="6.299999999999999">MM UI FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="alf_widgetfactory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">ALF Widget Factory API</text>
+        </g>
+        <g id="alf_widgetutils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">ALF Widget Utils API</text>
+        </g>
+        <g id="alf_widgetmodel_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">ALF Widget Model API</text>
+        </g>
+        <g id="osn_container_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">OSN Container API</text>
+        </g>
+        <g id="osn_global_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">OSN Global API</text>
+        </g>
+        <g id="osn_string_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">OSN String API</text>
+        </g>
+        <g id="alf_resourcepool_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">ALF Resource Pool API</text>
+        </g>
+        <g id="alf_containerwidget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">ALF Container Widget API</text>
+        </g>
+        <g id="alf_viewwidget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">ALF View Widget API</text>
+        </g>
+        <g id="alf_scrollbarwidget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">ALF Scrollbar Widget API</text>
+        </g>
+        <g id="alf_customlayoutmanagers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">ALF Custom Layout Managers API</text>
+        </g>
+        <g id="gesturehelper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Gesture Helper API</text>
+        </g>
+        <g id="mul_coverflowwidget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">MUL Coverflow Widget API</text>
+        </g>
+        <g id="mul_datamodel_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">MUL Data Model API</text>
+        </g>
+        <g id="mul_sliderwidget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">MUL Slider Widget API</text>
+        </g>
+        <g id="mul_widget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">MUL Widget API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mmuifw_info" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Multi­media UI Fmwk. Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="mmuifw_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">MM UI FW Build</text>
-        </g>
-       </g>
-      </g>
-      <g id="osncore" transform="translate(0 18.8)" class="collection">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">MM UI FW Build</text>
+        </g>
+       </g>
+      </g>
+      <g id="osncore" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">OS Neutral Library Core</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7774,7 +10818,7 @@
         </g>
        </g>
       </g>
-      <g id="alfwidgetutils" transform="translate(20.700000000000003 0)" class="collection">
+      <g id="alfwidgetutils" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Accelerated LAF Widget Utils</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7785,7 +10829,7 @@
         </g>
        </g>
       </g>
-      <g id="resourcepool" transform="translate(17.7 18.8)" class="collection">
+      <g id="resourcepool" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Resource Pool</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7796,7 +10840,7 @@
         </g>
        </g>
       </g>
-      <g id="widgetmodel" transform="translate(0 37.6)" class="collection">
+      <g id="widgetmodel" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Widget Model</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7807,7 +10851,7 @@
         </g>
        </g>
       </g>
-      <g id="mulwidgets" transform="translate(38.400000000000006 0)" class="collection">
+      <g id="mulwidgets" transform="translate(35.4 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">MUL Widgets</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7860,11 +10904,32 @@
       </g>
      </g>
     </g>
-    <g id="videoutils" class="package" transform="translate( 1523.1 0)">
+    <g id="videoutils" class="package" transform="translate( 2728.200000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="39.300000000000004" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="100.43">Video Utils</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="45.6" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="45.6" x="22.8" y="96.2">Video Utils</text>
+     <g transform="translate(0 3.2)">
+      <g id="videoutils_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Video Utils Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="videoscheduler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Scheduler API</text>
+        </g>
+        <g id="videoconnutility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Video Connection Utility API</text>
+        </g>
+        <g id="videoplayer_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Videoplayer Constants API</text>
+        </g>
+       </g>
+      </g>
       <g id="videoscheduler" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Video Sched­uler</text>
@@ -7897,24 +10962,144 @@
         </g>
        </g>
       </g>
-      <g id="videoutils_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Utils Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="videoutils_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Utils Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="mmmw" class="package" transform="translate( 1056 104.63000000000001)">
+      <g id="videoutils_info" transform="translate(30.000000000000004 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Utils Info</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+     </g>
+    </g>
+    <g id="mmmw" class="package" transform="translate( 1990.1999999999998 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="95.1" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="95.1" x="47.55" y="115.00000000000001">Multi­media Middle­ware</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="317.4000000000001" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="317.4000000000001" x="158.70000000000005" y="115.00000000000003">Multi­media Middle­ware</text>
+     <g transform="translate(0 3.2)">
+      <g id="mmmw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="223.2000000000001"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="221.8000000000001" height="6.299999999999999">MM Middle­ware Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="multimedia_data_source_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Multimedia Data Source API</text>
+        </g>
+        <g id="progressive_download_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Progressive Download API</text>
+        </g>
+        <g id="equalizer_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Equalizer UI API</text>
+        </g>
+        <g id="enhanced_media_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Enhanced Media Client API</text>
+        </g>
+        <g id="stream_control_custom_command_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Stream Control Custom Command API</text>
+        </g>
+        <g id="emc_buffer_source_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">EMC Buffer Source API</text>
+        </g>
+        <g id="emc_file_source_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">EMC File Source API</text>
+        </g>
+        <g id="audio_metadata_reader_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Audio MetaData Reader API</text>
+        </g>
+        <g id="emc_progressive_download_source_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">EMC Progressive Download Source API</text>
+        </g>
+        <g id="emc_volume_effect_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">EMC Volume Effect API</text>
+        </g>
+        <g id="emc_balance_effect_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">EMC Balance Effect API</text>
+        </g>
+        <g id="emc_descriptor_source_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">EMC Descriptor Source API</text>
+        </g>
+        <g id="emc_drm_config_intfc_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">EMC DRM Config Intfc API</text>
+        </g>
+        <g id="voip_audio_services_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">VoIP Audio Services</text>
+        </g>
+        <g id="configuration_components_factory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Configuration Components Factory API</text>
+        </g>
+        <g id="audio_output_control_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Audio Output Control Utility API</text>
+        </g>
+        <g id="audio_output_control_utility_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Audio Output Control Utility Proxy API</text>
+        </g>
+        <g id="emc_audio_effects_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">EMC Audio Effects API</text>
+        </g>
+        <g id="call_audio_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Call AudioControl API</text>
+        </g>
+        <g id="radio_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Radio Utilities API</text>
+        </g>
+        <g id="radio_preset_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Radio Preset Utilities API</text>
+        </g>
+        <g id="radio_monitor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Radio Monitor API</text>
+        </g>
+        <g id="thumbnail_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Thumbnail Engine API</text>
+        </g>
+        <g id="telephony_multimedia_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Telephony Multimedia Service API</text>
+        </g>
+       </g>
+      </g>
       <g id="mmfenh" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">MMF Enhancements</text>
@@ -7961,7 +11146,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia Frameworks</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mmserv" transform="translate(0 0)" class="collection">
+      <g id="mmserv" transform="translate(225.3000000000001 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Multimedia Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8007,29 +11192,24 @@
         </g>
        </g>
       </g>
-      <g id="mmmw_info" transform="translate(76.49999999999999 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">MM Middle­ware Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="mmmw_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">MM Middle­ware Platform Inter­faces</text>
-        </g>
+      <g id="mmmw_info" transform="translate(301.80000000000007 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">MM Middle­ware Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="mmmw_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">MM Middle­ware Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="helix" class="package" transform="translate( 1153.2 104.63000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">MM Middle­ware Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="helix" class="package" transform="translate( 2309.7 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000001">Helix</text>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Helix</text>
      <g transform="translate(0 3.2)">
       <g id="helix_ren" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -8044,11 +11224,57 @@
       </g>
      </g>
     </g>
-    <g id="camerasrv" class="package" transform="translate( 1564.5 0)">
+    <g id="camerasrv" class="package" transform="translate( 2775.900000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="37.2" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="37.2" x="18.6" y="100.43">Camera Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="109.79999999999998" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="109.79999999999998" x="54.89999999999999" y="96.2">Camera Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="camerasrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Camera Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="media_recorder_sink_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Media Recorder Sink API</text>
+        </g>
+        <g id="cae_extentension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">CAE Extension API</text>
+        </g>
+        <g id="camera_application_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Camera Application Engine API</text>
+        </g>
+        <g id="custom_onboard_camera_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Custom Onboard Camera API</text>
+        </g>
+        <g id="imaging_configuration_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Imaging Configuration Manager API</text>
+        </g>
+        <g id="media_recorder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Media Recorder API</text>
+        </g>
+        <g id="3gp_file_composer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">3GP File Composer API</text>
+        </g>
+        <g id="asynchronous_file_saving_queue_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Asynchronous File Saving Queue API</text>
+        </g>
+       </g>
+      </g>
       <g id="camappengine" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Camera App Engine</text>
@@ -8088,7 +11314,7 @@
         </g>
        </g>
       </g>
-      <g id="configmanagers" transform="translate(0 0)" class="collection">
+      <g id="configmanagers" transform="translate(76.49999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Config Managers</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8099,29 +11325,140 @@
         </g>
        </g>
       </g>
-      <g id="camerasrv_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Camera Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="camerasrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Camera Services Platform Inter­faces</text>
-        </g>
+      <g id="camerasrv_info" transform="translate(94.19999999999999 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Camera Services Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="camerasrv_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Camera Services Build</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="mmappfw" class="package" transform="translate( 1603.8 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Camera Services Build</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="mmappfw" class="package" transform="translate( 2887.800000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="102.29999999999998" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="102.29999999999998" x="51.14999999999999" y="100.43">Multi­media App Fmwk.</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="225.30000000000007" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="225.30000000000007" x="112.65000000000003" y="96.2">Multi­media App Fmwk.</text>
+     <g transform="translate(0 3.2)">
+      <g id="mmappfw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="204.60000000000008"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="203.20000000000007" height="6.299999999999999">MM App FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="inc" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Inc</text>
+        </g>
+        <g id="collection_helper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Collection Helper API</text>
+        </g>
+        <g id="harvester_collection_mediator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Harvester Collection Mediator API</text>
+        </g>
+        <g id="harvester_metadata_extractor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Harvester Metadata Extractor API</text>
+        </g>
+        <g id="harvester_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Harvester Server API</text>
+        </g>
+        <g id="harvester_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Harvester Utility API</text>
+        </g>
+        <g id="playlist_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Playlist Engine API</text>
+        </g>
+        <g id="mtp_keys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">MTP Keys API</text>
+        </g>
+        <g id="mpx_collection_common_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">MPX Collection Common Definition API</text>
+        </g>
+        <g id="mpx_collection_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">MPX Collection Utility API</text>
+        </g>
+        <g id="mpx_common_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">MPX Common API</text>
+        </g>
+        <g id="mpx_common_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">MPX Common Definition API</text>
+        </g>
+        <g id="mpx_playback_common_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">MPX Playback Common Definition API</text>
+        </g>
+        <g id="mpx_playback_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">MPX Playback Utility API</text>
+        </g>
+        <g id="mpx_base_view_plugins_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">MPX Base View Plugins API</text>
+        </g>
+        <g id="mpx_view_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">MPX View Utility API</text>
+        </g>
+        <g id="mpx_albumart_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">MPX Album Art Utility API</text>
+        </g>
+        <g id="media_player_settings_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Media Player Settings Engine API</text>
+        </g>
+        <g id="mpx_backstepping_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">MPX Backstepping Utility API</text>
+        </g>
+        <g id="asx_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">ASX Parser API</text>
+        </g>
+        <g id="playback_helper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Playback Helper API</text>
+        </g>
+        <g id="videoplaylist_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Video Playlist Utility API</text>
+        </g>
+       </g>
+      </g>
       <g id="mpx" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Multi­media Player</text>
@@ -8216,9 +11553,9 @@
         </g>
        </g>
       </g>
-      <g id="mmappfw_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">MM App FW Info</text>
+      <g id="mmappfw_info" transform="translate(206.70000000000007 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">MM App FW Info</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="mmappfw_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -8232,21 +11569,88 @@
          <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">MM App FW Test</text>
         </g>
-        <g id="mmappfw_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">MM App FW Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="inputmethods" class="package" transform="translate( 1183.2 104.63000000000001)">
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="inputmethods" class="package" transform="translate( 2339.7 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="243.9000000000001" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="243.9000000000001" x="121.95000000000005" y="115.00000000000001">Input Methods</text>
-     <g transform="translate(0 3.2)">
-      <g id="textinput" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="213.9000000000001" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="213.9000000000001" x="106.95000000000005" y="115.00000000000003">Input Methods</text>
+     <g transform="translate(0 3.2)">
+      <g id="inputmethods_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Input Methods Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="ptiengine_iti_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">PTI Engine API</text>
+        </g>
+        <g id="optical_character_recognition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Optical Character Recognition API</text>
+        </g>
+        <g id="input_language_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Input Language Info API</text>
+        </g>
+       </g>
+      </g>
+      <g id="inputmethods_plat" transform="translate(30.000000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Input Methods Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="pen_input_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Pen Input Server API</text>
+        </g>
+        <g id="ptiengine_hwr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">PTI Engine Handwriting Recognition API</text>
+        </g>
+        <g id="aknfep_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Avkon FEP Settings API</text>
+        </g>
+        <g id="aknfep_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Avkon FEP Status API</text>
+        </g>
+        <g id="ptiengine_key_definations_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">PTI Engine Key Definitions API</text>
+        </g>
+        <g id="aknfep_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Avkon FEP Definitions API</text>
+        </g>
+        <g id="aknfep_pen_support_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Avkon FEP Pen Support API</text>
+        </g>
+        <g id="ptiengine_indic_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">PTI Engine Indic Definitions API</text>
+        </g>
+        <g id="aknfep_uiinterface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Avkon FEP UI Interface API</text>
+        </g>
+       </g>
+      </g>
+      <g id="textinput" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="213.9000000000001"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="212.50000000000009" height="6.299999999999999">Text Input</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8368,7 +11772,7 @@
         </g>
        </g>
       </g>
-      <g id="fep" transform="translate(0 18.8)" class="collection">
+      <g id="fep" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">FEP</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8384,41 +11788,803 @@
         </g>
        </g>
       </g>
-      <g id="inputmethods_info" transform="translate(216.00000000000009 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Input Methods Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="inputmethods_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Input Methods Platform Inter­faces</text>
-        </g>
-        <g id="inputmethods_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Input Methods Public Inter­faces</text>
-        </g>
+      <g id="inputmethods_info" transform="translate(115.8 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Input Methods Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="inputmethods_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Input Methods Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="qt" class="package placeholder" transform="translate( 1429.2 104.63000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Input Methods Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="qt" class="package placeholder" transform="translate( 2555.7 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="57.000000000000014" dy="0.375em" height="15.600000000000001">Qt</text>
+     <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="15.600000000000001">Qt</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="classicui" class="package" transform="translate( 1509.3 104.63000000000001)">
+    <g id="classicui" class="package" transform="translate( 2635.7999999999997 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="105.60000000000001" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="105.60000000000001" x="52.800000000000004" y="115.00000000000001">Classic UI</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="1511.0999999999988" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="1511.0999999999988" x="755.5499999999994" y="115.00000000000003">Classic UI</text>
+     <g transform="translate(0 3.2)">
+      <g id="classicui_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="836.9999999999989"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="835.5999999999989" height="6.299999999999999">Classic UI Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="personalisation_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Personalisation Framework API</text>
+        </g>
+        <g id="signal_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Signal Pane API</text>
+        </g>
+        <g id="japanese_reading_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Japanese Reading API</text>
+        </g>
+        <g id="global_popup_priority_controller_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Global Popup Priority Controller API</text>
+        </g>
+        <g id="item_finder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Item Finder API</text>
+        </g>
+        <g id="avkon_fonts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Avkon Fonts API</text>
+        </g>
+        <g id="extended_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Extended Utilities API</text>
+        </g>
+        <g id="personalisation_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Personalisation Plugin API</text>
+        </g>
+        <g id="extended_aiw_criteria_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Extended AIW Criteria API</text>
+        </g>
+        <g id="personalisation_application_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Personalisation Application API</text>
+        </g>
+        <g id="volume_popup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Volume Popup API</text>
+        </g>
+        <g id="avkon_secondary_display_support_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">AVKON Secondary Display Support API</text>
+        </g>
+        <g id="extended_setting_pages_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Extended Setting Pages API</text>
+        </g>
+        <g id="extended_lists_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Extended Lists API</text>
+        </g>
+        <g id="input_block_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Input Block API</text>
+        </g>
+        <g id="avkon_ui_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">AVKON UI Server API</text>
+        </g>
+        <g id="number_grouping_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Number Grouping API</text>
+        </g>
+        <g id="extended_status_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Extended Status Pane API</text>
+        </g>
+        <g id="extended_notifiers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Extended Notifiers API</text>
+        </g>
+        <g id="task_list_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Task List API</text>
+        </g>
+        <g id="personalisation_slide_show_dialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Personalisation Slide Show Dialog API</text>
+        </g>
+        <g id="key_event_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Key Event Utilities API</text>
+        </g>
+        <g id="emergency_call_support_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Emergency Call Support API</text>
+        </g>
+        <g id="extended_dialogs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Extended Dialogs API</text>
+        </g>
+        <g id="legacy_ui_framework_headers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Legacy UI Framework Headers API</text>
+        </g>
+        <g id="extended_editors_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Extended Editors API</text>
+        </g>
+        <g id="alarm_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Alarm API</text>
+        </g>
+        <g id="aiw_service_interface_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">AIW Service Interface Base API</text>
+        </g>
+        <g id="list_effects_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">List Effects API</text>
+        </g>
+        <g id="find_item_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Find Item UI API</text>
+        </g>
+        <g id="server_application_services_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Server Application Services API</text>
+        </g>
+        <g id="common_ui_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Common UI Settings API</text>
+        </g>
+        <g id="aiw_service_interface_menu_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">AIW Service Interface Menu API</text>
+        </g>
+        <g id="eikon_server_extension_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">EIKON Server Extension Client API</text>
+        </g>
+        <g id="skinnable_clock_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Skinnable Clock API</text>
+        </g>
+        <g id="battery_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">Battery Pane API</text>
+        </g>
+        <g id="fep_document_navigation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">FEP Document Navigation API</text>
+        </g>
+        <g id="personalisation_localised_texts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Personalisation Localised Texts API</text>
+        </g>
+        <g id="memory_card_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Memory Card UI API</text>
+        </g>
+        <g id="avkon_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">AVKON Status API</text>
+        </g>
+        <g id="application_switching_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Application Switching API</text>
+        </g>
+        <g id="avkon_localised_texts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">AVKON Localised Texts API</text>
+        </g>
+        <g id="avkon_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">AVKON Secondary Display API</text>
+        </g>
+        <g id="extended_animation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Extended Animation API</text>
+        </g>
+        <g id="extended_notes_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Extended Notes API</text>
+        </g>
+        <g id="screensaver_animation_plugin_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">Screensaver Animation Plugin Definitions API</text>
+        </g>
+        <g id="text_scroller_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Text Scroller API</text>
+        </g>
+        <g id="custom_cursors_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Custom Cursors API</text>
+        </g>
+        <g id="screensaver_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="446.4000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="451.05000000000035">Screensaver Settings API</text>
+        </g>
+        <g id="global_window_priorities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="455.7000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="460.35000000000036">Global Window Priorities API</text>
+        </g>
+        <g id="extended_indicators_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="465.0000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="469.6500000000004">Extended Indicators API</text>
+        </g>
+        <g id="special_character_table_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="474.3000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="478.9500000000004">Special Character Table API</text>
+        </g>
+        <g id="avkon_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="483.6000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="488.2500000000004">AVKON Settings API</text>
+        </g>
+        <g id="extended_sounds_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="492.90000000000043" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="497.5500000000004">Extended Sounds API</text>
+        </g>
+        <g id="themes_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="502.20000000000044" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="506.8500000000004">Themes Settings API</text>
+        </g>
+        <g id="media_shared_document_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="511.50000000000045" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="516.1500000000004">Media Shared Document API</text>
+        </g>
+        <g id="extended_queries_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="520.8000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="525.4500000000004">Extended Queries API</text>
+        </g>
+        <g id="phone_number_text_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="530.1000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="534.7500000000003">Phone Number Text Utilities API</text>
+        </g>
+        <g id="screensaver_runtime_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="539.4000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="544.0500000000003">Screensaver Runtime API</text>
+        </g>
+        <g id="extended_scroller_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="548.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="553.3500000000003">Extended Scroller API</text>
+        </g>
+        <g id="key_rotator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="558.0000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="562.6500000000002">Key Rotator API</text>
+        </g>
+        <g id="extended_grids_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="567.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="571.9500000000002">Extended Grids API</text>
+        </g>
+        <g id="generic_parameter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="576.6000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="581.2500000000001">Generic Parameter API</text>
+        </g>
+        <g id="indicator_touch_observer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="585.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="590.5500000000001">Indicator Touch Observer API</text>
+        </g>
+        <g id="popup_form_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="595.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="599.85">Popup Form API</text>
+        </g>
+        <g id="stylus_activated_popup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="604.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="609.15">Stylus Activated Pop-up API</text>
+        </g>
+        <g id="indicator_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="613.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="618.4499999999999">Indicator Plugin API</text>
+        </g>
+        <g id="layout_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="623.0999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="627.7499999999999">Layout Configuration API</text>
+        </g>
+        <g id="common_file_dialogs_filter_factory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="632.3999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="637.0499999999998">Common File Dialogs Filter Factory API</text>
+        </g>
+        <g id="avkon_anim_dll_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="641.6999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="646.3499999999998">AVKON Anim DLL API</text>
+        </g>
+        <g id="extended_initialization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="650.9999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="655.6499999999998">Extended Initialization API</text>
+        </g>
+        <g id="long_tap_animation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="660.2999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="664.9499999999997">Long Tap Animation API</text>
+        </g>
+        <g id="extended_ui_framework_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="669.5999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="674.2499999999997">Extended UI Framework Definitions API</text>
+        </g>
+        <g id="extended_buttons_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="678.8999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="683.5499999999996">Extended Buttons API</text>
+        </g>
+        <g id="aiw_provider_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="688.1999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="692.8499999999996">AIW Provider Utility API</text>
+        </g>
+        <g id="transition_effect_parameters_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="697.4999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="702.1499999999995">Transition Effect Parameters API</text>
+        </g>
+        <g id="extended_input_capabilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="706.7999999999995" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="711.4499999999995">Extended Input Capabilities API</text>
+        </g>
+        <g id="uikon_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="716.0999999999995" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="720.7499999999994">UIKON Status API</text>
+        </g>
+        <g id="transition_effect_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="725.3999999999994" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="730.0499999999994">Transition Effect Utilities API</text>
+        </g>
+        <g id="pointer_event_modifier_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="734.6999999999994" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="739.3499999999993">Pointer Event Modifier API</text>
+        </g>
+        <g id="avkon_testability_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="743.9999999999993" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="748.6499999999993">AVKON Testability API</text>
+        </g>
+        <g id="ganes_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="753.2999999999993" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="757.9499999999993">ganes_api</text>
+        </g>
+        <g id="ode_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="762.5999999999992" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="767.2499999999992">Ode API</text>
+        </g>
+        <g id="physics_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="771.8999999999992" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="776.5499999999992">Physics API</text>
+        </g>
+        <g id="touch_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="781.1999999999991" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="785.8499999999991">Touch Pane API</text>
+        </g>
+        <g id="touch_pane_observer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="790.4999999999991" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="795.1499999999991">Touch Pane Observer API</text>
+        </g>
+        <g id="alternate_fs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="799.799999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="804.449999999999">Alternate FS API</text>
+        </g>
+        <g id="discreet_popup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="809.099999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="813.749999999999">Discreet Popup API</text>
+        </g>
+        <g id="touch_gesture_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="818.399999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="823.0499999999989">Touch Gesture Framework API</text>
+        </g>
+        <g id="extended_options_menu_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="827.6999999999989" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="832.3499999999989">Extended Options Menu API</text>
+        </g>
+       </g>
+      </g>
+      <g id="classicui_pub" transform="translate(839.0999999999989 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="576.6000000000001"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="575.2000000000002" height="6.299999999999999">Classic UI Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="input_frame_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Input Frame API</text>
+        </g>
+        <g id="window_server_event_observer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Window Server Event Observer API</text>
+        </g>
+        <g id="application_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Application Framework API</text>
+        </g>
+        <g id="scroller_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Scroller API</text>
+        </g>
+        <g id="ui_framework_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">UI Framework Utilities API</text>
+        </g>
+        <g id="ui_framework_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">UI Framework Definitions API</text>
+        </g>
+        <g id="buttons_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Buttons API</text>
+        </g>
+        <g id="queries_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Queries API</text>
+        </g>
+        <g id="aiw_generic_parameter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">AIW Generic Parameter API</text>
+        </g>
+        <g id="editors_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Editors API</text>
+        </g>
+        <g id="common_file_dialogs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Common File Dialogs API</text>
+        </g>
+        <g id="dialog_shutter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Dialog Shutter API</text>
+        </g>
+        <g id="fonts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Fonts API</text>
+        </g>
+        <g id="screen_clearer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Screen Clearer API</text>
+        </g>
+        <g id="notifiers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Notifiers API</text>
+        </g>
+        <g id="notes_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Notes API</text>
+        </g>
+        <g id="screen_saver_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Screen Saver API</text>
+        </g>
+        <g id="status_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Status Pane API</text>
+        </g>
+        <g id="base_controls_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Base Controls API</text>
+        </g>
+        <g id="grids_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Grids API</text>
+        </g>
+        <g id="context_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Context Pane API</text>
+        </g>
+        <g id="lists_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Lists API</text>
+        </g>
+        <g id="popups_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Popups API</text>
+        </g>
+        <g id="misc_controls_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Misc Controls API</text>
+        </g>
+        <g id="keylock_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Keylock API</text>
+        </g>
+        <g id="options_menu_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Options Menu API</text>
+        </g>
+        <g id="hierarchical_lists_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Hierarchical Lists API</text>
+        </g>
+        <g id="navigation_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Navigation Pane API</text>
+        </g>
+        <g id="tabs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Tabs API</text>
+        </g>
+        <g id="title_pane_touch_observer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Title Pane Touch Observer API</text>
+        </g>
+        <g id="choice_list_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Choice List API</text>
+        </g>
+        <g id="info_popup_note_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Info Popup Note API</text>
+        </g>
+        <g id="setting_pages_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">Setting Pages API</text>
+        </g>
+        <g id="screen_mode_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Screen Mode API</text>
+        </g>
+        <g id="indicators_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Indicators API</text>
+        </g>
+        <g id="error_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">Error UI API</text>
+        </g>
+        <g id="animation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">Animation API</text>
+        </g>
+        <g id="searchfield_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Searchfield API</text>
+        </g>
+        <g id="labels_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Labels API</text>
+        </g>
+        <g id="hotkeys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">Hotkeys API</text>
+        </g>
+        <g id="initialization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Initialization API</text>
+        </g>
+        <g id="volume_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">Volume Control API</text>
+        </g>
+        <g id="title_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">Title Pane API</text>
+        </g>
+        <g id="sounds_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Sounds API</text>
+        </g>
+        <g id="aiw_service_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">AIW Service Handler API</text>
+        </g>
+        <g id="aiw_criteria_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">AIW Criteria API</text>
+        </g>
+        <g id="touch_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Touch UI Utilities API</text>
+        </g>
+        <g id="generic_button_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Generic Button API</text>
+        </g>
+        <g id="form_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="446.4000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="451.05000000000035">Form API</text>
+        </g>
+        <g id="uikon_core_controls" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="455.7000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="460.35000000000036">Uikon Core Controls</text>
+        </g>
+        <g id="calendar_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="465.0000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="469.6500000000004">Calendar API</text>
+        </g>
+        <g id="toolbar_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="474.3000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="478.9500000000004">Toolbar API</text>
+        </g>
+        <g id="server_application_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="483.6000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="488.2500000000004">Server Application API</text>
+        </g>
+        <g id="slider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="492.90000000000043" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="497.5500000000004">Slider API</text>
+        </g>
+        <g id="private_ui_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="502.20000000000044" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="506.8500000000004">Private UI Framework API</text>
+        </g>
+        <g id="dialogs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="511.50000000000045" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="516.1500000000004">Dialogs API</text>
+        </g>
+        <g id="document_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="520.8000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="525.4500000000004">Document handler API</text>
+        </g>
+        <g id="images_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="530.1000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="534.7500000000003">Images API</text>
+        </g>
+        <g id="stylus_popup_menu_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="539.4000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="544.0500000000003">Stylus Pop-up Menu API</text>
+        </g>
+        <g id="information_preview_popup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="548.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="553.3500000000003">Information Preview Popup API</text>
+        </g>
+        <g id="intermediate_state_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="558.0000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="562.6500000000002">Intermediate State API</text>
+        </g>
+        <g id="help_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="567.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="571.9500000000002">Help Launcher API</text>
+        </g>
+       </g>
+      </g>
       <g id="ode" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Open Dynamics Engine</text>
@@ -8466,7 +12632,7 @@
         </g>
        </g>
       </g>
-      <g id="commonuis" transform="translate(0 0)" class="collection">
+      <g id="commonuis" transform="translate(1417.799999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Common UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8493,7 +12659,7 @@
         </g>
        </g>
       </g>
-      <g id="psln" transform="translate(20.700000000000003 0)" class="collection">
+      <g id="psln" transform="translate(1438.4999999999989 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Personal­ization</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8526,7 +12692,7 @@
         </g>
        </g>
       </g>
-      <g id="uiutils" transform="translate(38.400000000000006 0)" class="collection">
+      <g id="uiutils" transform="translate(1456.199999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">UI Utils</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8620,43 +12786,38 @@
         </g>
        </g>
       </g>
-      <g id="classicui_info" transform="translate(77.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Classic UI Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="classicui_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Classic UI Public Inter­faces</text>
-        </g>
-        <g id="classicui_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Classic UI Platform Inter­faces</text>
-        </g>
+      <g id="classicui_info" transform="translate(1495.4999999999989 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Classic UI Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="classicui_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Classic UI Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="svgt" class="package" transform="translate( 1617 104.63000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Classic UI Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="svgt" class="package" transform="translate( 4148.999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000001">SVG Tiny</text>
-     <g transform="translate(0 3.2)">
-      <g id="svgt_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SVG Tiny Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="svgt_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">SVG Tiny Platform Inter­faces</text>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">SVG Tiny</text>
+     <g transform="translate(0 3.2)">
+      <g id="svgt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">SVG Tiny Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="svgt_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">SVGT API</text>
+        </g>
+        <g id="nvg_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">NVG API</text>
         </g>
        </g>
       </g>
@@ -8678,19 +12839,44 @@
       </g>
      </g>
     </g>
-    <g id="uiaccelerator" class="package" transform="translate( 1647 104.63000000000001)">
+    <g id="uiaccelerator" class="package" transform="translate( 4178.999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000001">UI Accel­erator</text>
-     <g transform="translate(0 3.2)">
-      <g id="uiaccelerator_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">UI Accel­erator Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="uiaccelerator_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UI Accel­erator Platform Inter­faces</text>
+     <rect class="package" x="0" width="55.8" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="115.00000000000003">UI Accel­erator</text>
+     <g transform="translate(0 3.2)">
+      <g id="uiaccelerator_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">UI Accel­erator Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="alf_core_toolkit_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">ALF Core Toolkit API</text>
+        </g>
+        <g id="alf_visual_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">ALF Visual API</text>
+        </g>
+        <g id="alf_extended_visual_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">ALF Extended Visual API</text>
+        </g>
+        <g id="alf_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">ALF Extension API</text>
+        </g>
+        <g id="alf_tracing_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">ALF Tracing API</text>
+        </g>
+        <g id="alf_client_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">ALF Client Server API</text>
         </g>
        </g>
       </g>
@@ -8712,45 +12898,143 @@
       </g>
      </g>
     </g>
-    <g id="uiresources" class="package" transform="translate( 1677 104.63000000000001)">
+    <g id="uiresources" class="package" transform="translate( 4236.899999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="102.59999999999998" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="102.59999999999998" x="51.29999999999999" y="105" dy="0.375em">UI Resources</text>
-     <g transform="translate(0 3.2)">
-      <g id="uiresources_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">UI Resources Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="uiresources_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UI Resources Platform Inter­faces</text>
-        </g>
-        <g id="uiresources_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">UI Resources Public Inter­faces</text>
-        </g>
+     <rect class="package" x="0" width="280.5" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="280.5" x="140.25" y="105" dy="0.375em">UI Resources</text>
+     <g transform="translate(0 3.2)">
+      <g id="uiresources_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">UI Resources Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="pictograph_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Pictograph API</text>
+        </g>
+        <g id="skins_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Skins API</text>
+        </g>
+        <g id="font_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Font Definition API</text>
+        </g>
+        <g id="graphics_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Graphics API</text>
+        </g>
+        <g id="scalable_icons_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Scalable Icons API</text>
+        </g>
+        <g id="layout_id_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Layout ID Definitions API</text>
+        </g>
+       </g>
+      </g>
+      <g id="uiresources_plat" transform="translate(57.9 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="148.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="147.4" height="6.299999999999999">UI Resources Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="layout_system_private_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Layout System Private API</text>
+        </g>
+        <g id="layout_data_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Layout Data API</text>
+        </g>
+        <g id="cdl_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">CDL API</text>
+        </g>
+        <g id="extended_skins_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Extended Skins API</text>
+        </g>
+        <g id="tfx_server_controller_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">TFX Server Controller Plug-in API</text>
+        </g>
+        <g id="extended_fonts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Extended Fonts API</text>
+        </g>
+        <g id="graphic_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Graphic Configuration API</text>
+        </g>
+        <g id="mif_header_cdl_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">MIF Header CDL API</text>
+        </g>
+        <g id="personalisation_and_skins_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Personalisation and Skins Settings API</text>
+        </g>
+        <g id="tfx_effect_setup_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">TFX Effect Setup Plug-in API</text>
+        </g>
+        <g id="mifconv_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Mifconv Definitions API</text>
+        </g>
+        <g id="wallpaper_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Wallpaper Configuration API</text>
+        </g>
+        <g id="language_code_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Language Code Definitions API</text>
+        </g>
+        <g id="skins_image_attributes_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Skins Image Attributes API</text>
+        </g>
+        <g id="private_user_area_code_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Private User Area Code Definitions API</text>
+        </g>
+        <g id="tfx_server_plugin_ids_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">TFX Server Plug-in IDs API</text>
+        </g>
+       </g>
+      </g>
+      <g id="uiresources_info" transform="translate(208.8 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">UI Resources Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="uiresources_test" class="component placeholder">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">UI Resources Tests</text>
-        </g>
-        <g id="uiresources_test_pat" class="component placeholder">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">UI Resources Platform API Tests</text>
-        </g>
-        <g id="uiresources_test_pat" class="component placeholder">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="37.2" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">UI Resources Public API Tests</text>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UI Resources Tests</text>
         </g>
        </g>
       </g>
@@ -8801,7 +13085,7 @@
         </g>
        </g>
       </g>
-      <g id="skins" transform="translate(48.6 0)" class="collection">
+      <g id="skins" transform="translate(226.50000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Skins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8817,7 +13101,7 @@
         </g>
        </g>
       </g>
-      <g id="pictographs" transform="translate(69.3 0)" class="collection">
+      <g id="pictographs" transform="translate(247.20000000000002 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Picto­graphs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8866,7 +13150,7 @@
         </g>
        </g>
       </g>
-      <g id="helpthemes" transform="translate(86.99999999999999 0)" class="collection">
+      <g id="helpthemes" transform="translate(264.9 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Help Themes</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8879,11 +13163,43 @@
       </g>
      </g>
     </g>
-    <g id="hapticsservices" class="package" transform="translate( 1781.7 104.63000000000001)">
+    <g id="hapticsservices" class="package" transform="translate( 4519.499999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="55.8" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="115.00000000000001">Haptics Services</text>
-     <g transform="translate(0 3.2)">
+     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="115.00000000000003">Haptics Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="hapticsservices_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Haptics Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="tacticon_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Tacticon API</text>
+        </g>
+        <g id="tactile_feedback_core_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Tactile Feedback Core API</text>
+        </g>
+        <g id="tactile_feedback_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Tactile Feedback Server API</text>
+        </g>
+       </g>
+      </g>
+      <g id="hapticsservices_pub" transform="translate(30.000000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Haptics Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="tactile_feedback_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Tactile Feedback Client API</text>
+        </g>
+       </g>
+      </g>
       <g id="tacticonserver" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Tacticon Server</text>
@@ -8931,29 +13247,80 @@
         </g>
        </g>
       </g>
-      <g id="hapticsservices_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Haptics Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="hapticsservices_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Haptics Services Public Inter­faces</text>
-        </g>
-        <g id="hapticsservices_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Haptics Services Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="gsprofilesrv" class="package" transform="translate( 1839.6000000000001 104.63000000000001)">
+     </g>
+    </g>
+    <g id="gsprofilesrv" class="package" transform="translate( 4577.399999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="37.2" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="37.2" x="18.6" y="105" dy="0.375em">General Settings &amp; Profiles Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="104.39999999999998" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="104.39999999999998" x="52.19999999999999" y="105" dy="0.375em">General Settings &amp; Profiles Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="gsprofilesrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">GS &amp; Profiles Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="profiles_engine_active_profile_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Profiles Engine Active Profile Settings API</text>
+        </g>
+        <g id="profiles_engine_wrapper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Profiles Engine Wrapper API</text>
+        </g>
+       </g>
+      </g>
+      <g id="gsprofilesrv_plat" transform="translate(20.700000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">GS &amp; Profiles Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="profiles_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Profiles Engine API</text>
+        </g>
+        <g id="profiles_mediafilelist_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Media File List API</text>
+        </g>
+        <g id="filelist_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">File List API</text>
+        </g>
+        <g id="settings_backgroundimage_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Settings Background Image API</text>
+        </g>
+        <g id="settings_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Settings Framework API</text>
+        </g>
+        <g id="settings_launch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Settings Launch API</text>
+        </g>
+        <g id="settings_listbox_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Settings List Box API</text>
+        </g>
+        <g id="settings_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Settings Plugin API</text>
+        </g>
+        <g id="settings_uis_cenrep_collection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Settings UIs CenRep Collection API</text>
+        </g>
+       </g>
+      </g>
       <g id="gssettingsuis" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">General Settings UIs</text>
@@ -8991,29 +13358,129 @@
         </g>
        </g>
       </g>
-      <g id="gsprofilesrv_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">GS &amp; Profiles Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="gsprofilesrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">GS &amp; Profiles Services Platform Inter­faces</text>
-        </g>
-        <g id="gsprofilesrv_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">GS &amp; Profiles Services Public Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="homescreensrv" class="package" transform="translate( 1708.1999999999998 0)">
+     </g>
+    </g>
+    <g id="homescreensrv" class="package" transform="translate( 3115.200000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="122.10000000000001" height="101.43" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="122.10000000000001" x="61.050000000000004" y="100.43">Home Screen Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="204.60000000000008" height="97.2" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="168.30000000000007" x="120.45000000000005" y="29.8" dy="0.375em">Home Screen Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="homescreensrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="204.60000000000008"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="203.20000000000007" height="6.299999999999999">Home Screen Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="ai_content_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">AI Content Model API</text>
+        </g>
+        <g id="ai_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AI Utilities API</text>
+        </g>
+        <g id="ai_plugin_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">AI Plug-in Management API</text>
+        </g>
+        <g id="ai_plugin_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">AI Plug-in Information API</text>
+        </g>
+        <g id="ai_variation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">AI Variation API</text>
+        </g>
+        <g id="action_handler_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Action Handler Plugin API</text>
+        </g>
+        <g id="content_harvester_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Content Harvester Plugin API</text>
+        </g>
+        <g id="menu_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Menu Model API</text>
+        </g>
+        <g id="menu_sat_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Menu SAT Interface API</text>
+        </g>
+        <g id="external_home_screen_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">External Home Screen API</text>
+        </g>
+        <g id="menu_content_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Menu Content Service API</text>
+        </g>
+        <g id="sapi_contentpublishing" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">SAPI Content Publishing</text>
+        </g>
+        <g id="sapi_backstepping" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">SAPI Backstepping</text>
+        </g>
+        <g id="sapi_actionhandler" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">SAPI Action Handler</text>
+        </g>
+        <g id="sapi_homescreenplugin" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">SAPI Homescreen Plugin</text>
+        </g>
+        <g id="sapi_menucontent" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">SAPI Menu Content</text>
+        </g>
+        <g id="xcfw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">XCFW API</text>
+        </g>
+        <g id="idlefw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Idle Framework API</text>
+        </g>
+        <g id="hs_widget_publisher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Home Screen Publishing API</text>
+        </g>
+        <g id="context_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">UI Context Utility API</text>
+        </g>
+        <g id="hs_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">HS Settings API</text>
+        </g>
+        <g id="hs_content_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">HS Content Control API</text>
+        </g>
+       </g>
+      </g>
       <g id="xcfw" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">XML Content Frame­work</text>
@@ -9219,24 +13686,75 @@
         </g>
        </g>
       </g>
-      <g id="homescreensrv_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Home Screen Services Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="homescreensrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Home Screen Services Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="appinstall" class="package" transform="translate( 1878.9 104.63000000000001)">
+     </g>
+    </g>
+    <g id="appinstall" class="package" transform="translate( 4683.899999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="75.60000000000001" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="75.60000000000001" x="37.800000000000004" y="115.00000000000001">App Install­ation</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="166.79999999999998" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="166.79999999999998" x="83.39999999999999" y="115.00000000000003">App Install­ation</text>
+     <g transform="translate(0 3.2)">
+      <g id="appinstall_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">App Install­ation Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="iaupdate_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IA Update API</text>
+        </g>
+        <g id="task_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Task Plugin API</text>
+        </g>
+        <g id="sw_installer_common_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SW Installer Common UI API</text>
+        </g>
+        <g id="sw_installer_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">SW Installer Launcher API</text>
+        </g>
+        <g id="task_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Task Management API</text>
+        </g>
+        <g id="sw_installer_ui_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">SW Installer UI Plugin API</text>
+        </g>
+        <g id="sw_installer_cr_keys" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">SW Installer CR Keys</text>
+        </g>
+        <g id="sw_installer_ps_keys" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">SW Installer PS Keys</text>
+        </g>
+        <g id="appmngr2runtimeapi" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Application Manager 2 Runtime Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="appinstall_pub" transform="translate(85.79999999999998 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">App Install­ation Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="startup_list_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Startup List Management API</text>
+        </g>
+       </g>
+      </g>
       <g id="ncdengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Nokia Content Discover</text>
@@ -9275,7 +13793,7 @@
         </g>
        </g>
       </g>
-      <g id="iaupdateapi_stub" transform="translate(0 0)" class="collection">
+      <g id="iaupdateapi_stub" transform="translate(103.49999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">IA Update API Stub</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9286,7 +13804,7 @@
         </g>
        </g>
       </g>
-      <g id="iaupdate" transform="translate(17.7 0)" class="collection">
+      <g id="iaupdate" transform="translate(121.19999999999997 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Independent Apps Update</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9356,35 +13874,81 @@
         </g>
        </g>
       </g>
-      <g id="appinstall_info" transform="translate(47.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">App Install­ation Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="appinstall_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">App Install­ation Public Inter­faces</text>
-        </g>
-        <g id="appinstall_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">App Install­ation Platform Inter­faces</text>
-        </g>
+      <g id="appinstall_info" transform="translate(151.2 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">App Install­ation Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="appinstall_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">App Install­ation Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="serviceapifw" class="package" transform="translate( 1832.3999999999999 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">App Install­ation Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="serviceapifw" class="package" transform="translate( 3321.9000000000015 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="37.2" height="101.43" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="37.2" x="18.6" y="100.43">Service API Frame­work</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="101.39999999999998" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="86.2" dy="0.375em">Service API Frame­work</text>
+     <g transform="translate(0 3.2)">
+      <g id="serviceapifw_pub" transform="translate(0 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service API FW Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="serviceapifw_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Service API FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="rtsecuritymanager_common_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Runtime Security Manager Common API</text>
+        </g>
+        <g id="rtsecuritymanager_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Runtime Security Manager Utility API</text>
+        </g>
+        <g id="rtsecuritymanager_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Runtime Security Manager Client API</text>
+        </g>
+        <g id="liw_provider_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">LIW Provider Utility API</text>
+        </g>
+        <g id="liw_service_interface_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">LIW Service Interface Base API</text>
+        </g>
+        <g id="liw_service_interface_menu_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">LIW Service Interface Menu API</text>
+        </g>
+        <g id="liw_criteria_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">LIW Criteria API</text>
+        </g>
+        <g id="liw_generic_parameter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">LIW Generic Parameter API</text>
+        </g>
+        <g id="liw_service_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">LIW Service Handler API</text>
+        </g>
+       </g>
+      </g>
       <g id="rtsecuritymanager" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Runtime Security Manager</text>
@@ -9422,28 +13986,12 @@
         </g>
        </g>
       </g>
-      <g id="serviceapifw_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Service API Fmwk. Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="serviceapifw_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Service API FW Platform Inter­faces</text>
-        </g>
-        <g id="serviceapifw_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Service API FW Public Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="serviceapi" class="package" transform="translate( 1871.6999999999998 0)">
+     </g>
+    </g>
+    <g id="serviceapi" class="package" transform="translate( 3425.4000000000015 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="120.89999999999998" height="101.43" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="120.89999999999998" x="60.44999999999999" y="100.43">Service API</text>
+     <rect class="package" x="0" width="120.89999999999998" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="120.89999999999998" x="60.44999999999999" y="96.2">Service API</text>
      <g transform="translate(0 3.2)">
       <g id="serviceproviders" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="120.89999999999998"/>
@@ -9518,29 +14066,151 @@
       </g>
      </g>
     </g>
-    <g id="web" class="package" transform="translate( 1994.6999999999998 0)">
+    <g id="web" class="package" transform="translate( 3548.4000000000015 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="130.2" height="101.43" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="130.2" x="65.1" y="100.43">Web</text>
-     <g transform="translate(0 3.2)">
-      <g id="web_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Web Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="web_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Web Platform Inter­faces</text>
-        </g>
-        <g id="web_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Web Public Inter­faces</text>
-        </g>
+     <rect class="package" x="0" width="328.8" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="328.8" x="164.4" y="86.2" dy="0.375em">Web</text>
+     <g transform="translate(0 3.2)">
+      <g id="web_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Web Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="browser_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Browser Control API</text>
+        </g>
+        <g id="download_mgr_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Download Manager Client API</text>
+        </g>
+        <g id="download_mgr_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Download Manager UI Library API</text>
+        </g>
+        <g id="favourites_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Favourites Engine API</text>
+        </g>
+        <g id="browser_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Browser Plug-in API</text>
+        </g>
+        <g id="settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Settings API</text>
+        </g>
+       </g>
+      </g>
+      <g id="web_plat" transform="translate(57.9 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="167.40000000000003"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="166.00000000000003" height="6.299999999999999">Web Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="browser_platform_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Browser Platform API</text>
+        </g>
+        <g id="aiw_browser_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AIW Browser Provider API</text>
+        </g>
+        <g id="browser_dialogs_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Browser Dialogs Provider API</text>
+        </g>
+        <g id="browser_platform_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Browser Platform API</text>
+        </g>
+        <g id="cod_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">COD Handler API</text>
+        </g>
+        <g id="connection_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Connection Manager API</text>
+        </g>
+        <g id="cxml_library_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">cXml Library API</text>
+        </g>
+        <g id="download_mgr_client_api_extn" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Download Manager Client API Extension</text>
+        </g>
+        <g id="feeds_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Feeds Engine API</text>
+        </g>
+        <g id="launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Launcher API</text>
+        </g>
+        <g id="multipart_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Multipart Parser API</text>
+        </g>
+        <g id="recent_url_store_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Recent URL Store API</text>
+        </g>
+        <g id="scheme_handler_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Scheme Handler Plugin API</text>
+        </g>
+        <g id="scriptable_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Scriptable Plugin API</text>
+        </g>
+        <g id="webutils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Web Utils API</text>
+        </g>
+        <g id="widget_registry_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Widget Registry API</text>
+        </g>
+        <g id="xml_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">XML Parser API</text>
+        </g>
+        <g id="stmgesturefw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">State Machine Gesture Framework API </text>
+        </g>
+       </g>
+      </g>
+      <g id="web_info" transform="translate(227.40000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Web Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="web_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Web Build</text>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Web Build</text>
         </g>
        </g>
       </g>
@@ -9692,7 +14362,7 @@
         </g>
        </g>
       </g>
-      <g id="codhandler" transform="translate(30.000000000000004 0)" class="collection">
+      <g id="codhandler" transform="translate(245.10000000000005 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Content Object Descriptor Handler</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9798,11 +14468,52 @@
       </g>
      </g>
     </g>
-    <g id="websrv" class="package" transform="translate( 1956.6000000000001 104.63000000000001)">
+    <g id="websrv" class="package" transform="translate( 4852.799999999998 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="260.40000000000015" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="260.40000000000015" x="130.20000000000007" y="115.00000000000001">Web Services</text>
-     <g transform="translate(0 3.2)">
+     <text text-anchor="middle" class="package" width="260.40000000000015" x="130.20000000000007" y="115.00000000000003">Web Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="websrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Web Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="web_service_description_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Web Service Description API</text>
+        </g>
+        <g id="web_service_connection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Web Service Connection API</text>
+        </g>
+        <g id="web_service_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Web Service Manager API</text>
+        </g>
+        <g id="hostlet_connection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Hostlet Connection API</text>
+        </g>
+        <g id="web_service_messaging_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Web Service Messaging API</text>
+        </g>
+        <g id="xml_extensions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">XML Extensions API</text>
+        </g>
+        <g id="xml_fragment_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">XML Fragment API</text>
+        </g>
+       </g>
+      </g>
       <g id="webservices" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="260.40000000000015"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="259.00000000000017" height="6.299999999999999">Web Services Fmwk.</text>
@@ -9949,28 +14660,23 @@
         </g>
        </g>
       </g>
-      <g id="websrv_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Web Services Info</text>
+      <g id="websrv_info" transform="translate(67.19999999999999 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Web Services Info</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="websrv_bld" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Web Services Build</text>
         </g>
-        <g id="websrv_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Web Services Public Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="platformtools" class="package" transform="translate( 2219.1000000000004 104.63000000000001)">
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="platformtools" class="package" transform="translate( 5115.299999999998 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000001">Platform Tools</text>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Platform Tools</text>
      <g transform="translate(0 3.2)">
       <g id="gfxconversion" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -9990,11 +14696,38 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 2127 0)">
+    <g id="uitools" class="package" transform="translate( 3879.3000000000015 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="101.43" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.43">UI Tools</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
+     <g transform="translate(0 3.2)">
+      <g id="uitools_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">UI Tools Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="third_party_bitmap_palette_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Third Party Bitmap Palette API</text>
+        </g>
+       </g>
+      </g>
+      <g id="uitools_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">UI Tools Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="cdl_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">CDL API</text>
+        </g>
+        <g id="layout_system_private_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Layout System Private API</text>
+        </g>
+       </g>
+      </g>
       <g id="cdlcompilertoolkit" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">CDL Compiler Toolkit</text>
@@ -10082,22 +14815,6 @@
         </g>
        </g>
       </g>
-      <g id="uitools_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">UI Tools Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="uitools_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UI Tools Platform Inter­faces</text>
-        </g>
-        <g id="uitools_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">UI Tools Public Inter­faces</text>
-        </g>
-       </g>
-      </g>
      </g>
     </g>
    </g>
@@ -10106,14 +14823,41 @@
  <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="170.63000000000002"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="170.63000000000002" height="9.3" x="-85.61500000000001">Applications</text>
-  <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="2418.6000000000004" height="170.63000000000002"/>
+  <g class="layer-detail" transform="translate(798.1999999999989 3.2)">
+   <rect x="-785.399999999999" class="layer" y="-3.2" width="5143.199999999998" height="170.63000000000002"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="134.39999999999998" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="134.39999999999998" x="67.19999999999999" y="81.63000000000001">Location Apps</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="113.69999999999999" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="81.63000000000001">Location Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="loc_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location Apps Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="location_centre_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Centre API</text>
+        </g>
+       </g>
+      </g>
+      <g id="loc_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Location Apps Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="landmarks_ui_selector_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Landmarks UI Selector API</text>
+        </g>
+        <g id="landmarks_ui_addedit_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Landmarks UI Add/Edit API</text>
+        </g>
+       </g>
+      </g>
       <g id="basiclocationinfodisplay" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Basic Location Info Display</text>
@@ -10207,7 +14951,7 @@
         </g>
        </g>
       </g>
-      <g id="locationlandmarksrefappfors60" transform="translate(0 0)" class="collection">
+      <g id="locationlandmarksrefappfors60" transform="translate(38.400000000000006 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location Land­marks Ref App for S60</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10218,7 +14962,7 @@
         </g>
        </g>
       </g>
-      <g id="locationlandmarksuirefapp" transform="translate(17.7 0)" class="collection">
+      <g id="locationlandmarksuirefapp" transform="translate(56.10000000000001 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location Land­marks UI Ref App</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10229,7 +14973,7 @@
         </g>
        </g>
       </g>
-      <g id="locationsatviewrefapp" transform="translate(35.4 0)" class="collection">
+      <g id="locationsatviewrefapp" transform="translate(73.80000000000001 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location Satellite View Ref App</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10251,7 +14995,7 @@
         </g>
        </g>
       </g>
-      <g id="mapnavproviderrefapp" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="mapnavproviderrefapp" transform="translate(91.5 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Map &amp; Nav Provider Ref App</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10293,22 +15037,6 @@
         </g>
        </g>
       </g>
-      <g id="location_info" transform="translate(115.8 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Location Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="loc_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Apps Public Inter­faces</text>
-        </g>
-        <g id="loc_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Location Apps Platform Interfaces</text>
-        </g>
-       </g>
-      </g>
      </g>
     </g>
     <g id="mmsharinguis" class="package" transform="translate( 0 85.83000000000001)">
@@ -10316,6 +15044,27 @@
      <rect class="package" x="0" width="65.1" height="78.4" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="77.4">Multi­media Sharing UIs</text>
      <g transform="translate(0 3.2)">
+      <g id="mmsharinguis_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">MM Sharing UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="multimedia_sharing_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Multimedia Sharing Settings API</text>
+        </g>
+        <g id="multimedia_sharing_resource_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Multimedia Sharing Resource API</text>
+        </g>
+        <g id="multimedia_sharing_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Multimedia Sharing Manager API</text>
+        </g>
+       </g>
+      </g>
       <g id="mmsharing" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Multi­media Sharing</text>
@@ -10388,30 +15137,116 @@
         </g>
        </g>
       </g>
-      <g id="mmsharinguis_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">MM Sharing UIs Info</text>
+      <g id="mmsharinguis_info" transform="translate(30.000000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">MM Sharing UIs Info</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="mmsharinguis_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">MM Sharing UIs Build</text>
         </g>
-        <g id="mmsharinguis_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">MM Sharing UIs Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="phone" class="package" transform="translate( 136.49999999999997 0)">
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="phone" class="package" transform="translate( 115.79999999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="101.39999999999998" height="164.23000000000002" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="163.23000000000002">Phone Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="phoneapp" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="243.9" height="164.23000000000002" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="243.9" x="121.95" y="163.23000000000002">Phone Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="phone_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="158.10000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="156.70000000000002" height="6.299999999999999">Phone Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="3d_ringing_tone_enabler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">3D Ringing Tone Enabler API</text>
+        </g>
+        <g id="telephony_comms_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Telephony Comms Information API</text>
+        </g>
+        <g id="telephony_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Telephony Information API</text>
+        </g>
+        <g id="telephony_device_mode_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Telephony Device Mode API</text>
+        </g>
+        <g id="telephony_remote_party_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Telephony Remote Party Information API</text>
+        </g>
+        <g id="telephony_video_mailbox_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Telephony Video Mailbox Settings API</text>
+        </g>
+        <g id="telephony_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Telephony Configuration API</text>
+        </g>
+        <g id="telephony_microphone_mute_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Telephony Microphone Mute Status API</text>
+        </g>
+        <g id="dialer_keypad_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Dialer Keypad API</text>
+        </g>
+        <g id="telephony_logging_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Telephony Logging Extension API</text>
+        </g>
+        <g id="telephony_matching_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Telephony Matching Extension API</text>
+        </g>
+        <g id="telephony_bubble_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Telephony Bubble Extension API</text>
+        </g>
+        <g id="telephony_menu_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Telephony Menu Extension API</text>
+        </g>
+        <g id="phone_application_commands_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Phone Application Commands API</text>
+        </g>
+        <g id="phone_application_voip_commands_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Phone Application VOIP Commands API</text>
+        </g>
+        <g id="telephony_mediator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Telephony Mediator API</text>
+        </g>
+        <g id="video_telephony_mediator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Video Telephony Mediator API</text>
+        </g>
+       </g>
+      </g>
+      <g id="phoneapp" transform="translate(160.20000000000002 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Phone App</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10565,17 +15400,6 @@
         </g>
        </g>
       </g>
-      <g id="phone_info" transform="translate(85.79999999999998 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Phone Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="phone_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Phone Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
       <g id="phoneplugins" transform="translate(20.700000000000003 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Phone Plugins</text>
@@ -10589,11 +15413,27 @@
       </g>
      </g>
     </g>
-    <g id="videotelephony" class="package" transform="translate( 239.99999999999994 0)">
+    <g id="videotelephony" class="package" transform="translate( 361.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Telephony Apps</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="36.300000000000004" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="81.63000000000001">Video Telephony Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="videotelephony_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">VT Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="video_telephony_control_mediator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Telephony Control Mediator API</text>
+        </g>
+        <g id="video_telephony_media_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Video Telephony Media Configuration API</text>
+        </g>
+       </g>
+      </g>
       <g id="vtengines" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Video Telephony Engines</text>
@@ -10610,7 +15450,7 @@
         </g>
        </g>
       </g>
-      <g id="vtuis" transform="translate(0 0)" class="collection">
+      <g id="vtuis" transform="translate(20.700000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Telephony UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10648,25 +15488,50 @@
         </g>
        </g>
       </g>
-      <g id="videotelephony_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">VT Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="videotelephony_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">VT Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="iptelephony" class="package" transform="translate( 275.4 0)">
+     </g>
+    </g>
+    <g id="iptelephony" class="package" transform="translate( 400.20000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="110.69999999999997" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="110.69999999999997" x="55.34999999999999" y="81.63000000000001">IP Telephony</text>
-     <g transform="translate(0 3.2)">
-      <g id="iptelcommsconfig" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="113.69999999999999" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="81.63000000000001">IP Telephony</text>
+     <g transform="translate(0 3.2)">
+      <g id="iptel_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">IP Telephony Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="richcallsettingsengine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Rich Call Settings Engine API</text>
+        </g>
+        <g id="cch_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">CCH Client API</text>
+        </g>
+        <g id="cch_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">CCH Server API</text>
+        </g>
+        <g id="csc_settingsui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">CSC Settings UI API</text>
+        </g>
+        <g id="vccpropertyhandler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">VCC Property Handler API</text>
+        </g>
+        <g id="vcc_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">VCC API</text>
+        </g>
+       </g>
+      </g>
+      <g id="iptelcommsconfig" transform="translate(57.9 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">IP Telephony Comms Config</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10847,24 +15712,29 @@
         </g>
        </g>
       </g>
-      <g id="iptelephony_info" transform="translate(57.9 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">IP Telephony Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="iptel_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IP Telephony Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="settingsuis" class="package" transform="translate( 239.99999999999994 85.83000000000001)">
+     </g>
+    </g>
+    <g id="settingsuis" class="package" transform="translate( 361.8 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="46.5" height="78.4" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="46.5" x="23.25" y="77.4">Settings UIs</text>
      <g transform="translate(0 3.2)">
+      <g id="devmngt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Settings UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="default_app_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Default App Client API</text>
+        </g>
+        <g id="services_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Services DB API</text>
+        </g>
+       </g>
+      </g>
       <g id="defaultapplicationsettings" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Default App Settings</text>
@@ -10896,7 +15766,7 @@
         </g>
        </g>
       </g>
-      <g id="systemswuis" transform="translate(0 0)" class="collection">
+      <g id="systemswuis" transform="translate(20.700000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">System SW UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10907,29 +15777,44 @@
         </g>
        </g>
       </g>
-      <g id="settingsuis_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Settings UIs Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="devmngt_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Settings UIs Platform Inter­faces</text>
-        </g>
-        <g id="devmngt_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Settings UIs Public Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="contentcontrol" class="package" transform="translate( 288.59999999999997 85.83000000000001)">
+     </g>
+    </g>
+    <g id="contentcontrol" class="package" transform="translate( 410.40000000000003 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
-     <rect class="package" x="0" width="36.300000000000004" height="78.4" y="0" style="fill:darkseagreen;"/>
-     <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="77.4">Content Control Daemons</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="67.19999999999999" height="78.4" y="0" style="fill:darkseagreen;"/>
+     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="77.4">Content Control Daemons</text>
+     <g transform="translate(0 3.2)">
+      <g id="contentctrl_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Content Control Daemons Platforn Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="oma_ds_presync_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">OMA DS PreSync Plugin API</text>
+        </g>
+        <g id="ds_agenda_handler_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">DS Agenda Handler Plugin API</text>
+        </g>
+        <g id="ds_folder_util_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">DS Folder Util API</text>
+        </g>
+        <g id="adapter_customization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Adapter Customization API</text>
+        </g>
+        <g id="ds_data_modification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">DS Data Modification API</text>
+        </g>
+       </g>
+      </g>
       <g id="dsdcmoadapter" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Data Sync DCMO Adapter</text>
@@ -10941,7 +15826,7 @@
         </g>
        </g>
       </g>
-      <g id="omads" transform="translate(0 0)" class="collection">
+      <g id="omads" transform="translate(48.6 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">OMA Data Sync</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10957,20 +15842,9 @@
         </g>
        </g>
       </g>
-      <g id="contentcontrol_info" transform="translate(20.700000000000003 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Content Control Daemons Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="contentctrl_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Content Control Daemons Platforn Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="devicecontrol" class="package" transform="translate( 327 85.83000000000001)">
+     </g>
+    </g>
+    <g id="devicecontrol" class="package" transform="translate( 479.70000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="113.69999999999999" height="78.4" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="77.4">Dev­ice Control Daemons</text>
@@ -11148,7 +16022,7 @@
       </g>
      </g>
     </g>
-    <g id="printing" class="package" transform="translate( 442.79999999999995 85.83000000000001)">
+    <g id="printing" class="package" transform="translate( 595.5 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="37.2" height="78.4" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="37.2" x="18.6" y="77.4">Printing</text>
@@ -11181,11 +16055,22 @@
       </g>
      </g>
     </g>
-    <g id="files" class="package" transform="translate( 388.19999999999993 0)">
+    <g id="files" class="package" transform="translate( 516 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="76.5" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="76.5" x="38.25" y="81.63000000000001">File Manager Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="files_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">File Manager Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="memory_scan_popup_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Memory Scan Popup UI API</text>
+        </g>
+       </g>
+      </g>
       <g id="deviceencryption" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Device Encryption</text>
@@ -11222,7 +16107,7 @@
         </g>
        </g>
       </g>
-      <g id="filemanager" transform="translate(0 0)" class="collection">
+      <g id="filemanager" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">File Manager</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11249,20 +16134,9 @@
         </g>
        </g>
       </g>
-      <g id="files_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">File Manager Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="files_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">File Manager Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="utils" class="package" transform="translate( 466.79999999999995 0)">
+     </g>
+    </g>
+    <g id="utils" class="package" transform="translate( 594.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Utility Apps</text>
@@ -11290,11 +16164,298 @@
       </g>
      </g>
     </g>
-    <g id="contacts" class="package" transform="translate( 496.79999999999995 0)">
+    <g id="contacts" class="package" transform="translate( 634.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="95.1" height="164.23000000000002" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="95.1" x="47.55" y="163.23000000000002">Contacts Apps</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="579.0000000000003" height="164.23000000000002" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="579.0000000000003" x="289.50000000000017" y="163.23000000000002">Contacts Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="contacts_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Contacts Apps Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="phonebook_fetch_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Phonebook Fetch UI API</text>
+        </g>
+        <g id="phonebook_data_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Phonebook Data Management API</text>
+        </g>
+        <g id="phonebook_vcard_importexport_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Phonebook vCard Import/Export API</text>
+        </g>
+        <g id="phonebook_data_addedit_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Phonebook Data Add/Edit UI API</text>
+        </g>
+        <g id="phonebook_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Phonebook UI Utilities API</text>
+        </g>
+        <g id="phonebook_thumbnail_operation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Phonebook Thumbnail Operation API</text>
+        </g>
+        <g id="speed_dial_utility_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Speed Dial Utility Control API</text>
+        </g>
+       </g>
+      </g>
+      <g id="contacts_plat" transform="translate(67.19999999999999 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="446.4000000000004"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="445.0000000000004" height="6.299999999999999">Contacts Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="virtual_phonebook_store_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Virtual Phonebook Store API</text>
+        </g>
+        <g id="virtual_phonebook_sim_services_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Virtual Phonebook SIM Services API</text>
+        </g>
+        <g id="virtual_phonebook_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Virtual Phonebook Configuration API</text>
+        </g>
+        <g id="virtual_phonebook_copy_policy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Virtual Phonebook Copy Policy API</text>
+        </g>
+        <g id="virtual_phonebook_policy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Virtual Phonebook Policy API</text>
+        </g>
+        <g id="virtual_phonebook_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Virtual Phonebook Engine API</text>
+        </g>
+        <g id="virtual_phonebook_migration_support_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Virtual Phonebook Migration Support API</text>
+        </g>
+        <g id="virtual_phonebook_view_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Virtual Phonebook View Definition API</text>
+        </g>
+        <g id="virtual_phonebook_vcard_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Virtual Phonebook vCard API</text>
+        </g>
+        <g id="cms_contactor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">CMS Contactor API</text>
+        </g>
+        <g id="contactpresence_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Contact Presence API</text>
+        </g>
+        <g id="presence_cache_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Presence Cache API</text>
+        </g>
+        <g id="phonebook_internal_common_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Phonebook Internal Common API</text>
+        </g>
+        <g id="phonebook_internal_appfw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Phonebook Internal App Framework API</text>
+        </g>
+        <g id="phonebook_internal_data_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Phonebook Internal Data Management API</text>
+        </g>
+        <g id="phonebook_2_xsp_extension_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Phonebook 2 xSP Extension Manager API</text>
+        </g>
+        <g id="phonebook_ui_controls_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Phonebook UI Controls API</text>
+        </g>
+        <g id="phonebook_2_image_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Phonebook 2 Image Management API</text>
+        </g>
+        <g id="phonebook_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Phonebook Extension API</text>
+        </g>
+        <g id="phonebook_public_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Phonebook Public Constants API</text>
+        </g>
+        <g id="phonebook_internal_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Phonebook Internal UI Utilities API</text>
+        </g>
+        <g id="logs_engine_api_extensions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Logs Engine API Extensions</text>
+        </g>
+        <g id="phonebook_thumbnails_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Phonebook Thumbnails API</text>
+        </g>
+        <g id="phonebook_2_icon_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Phonebook 2 Icon API</text>
+        </g>
+        <g id="phonebook_engine_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Phonebook Engine Extension API</text>
+        </g>
+        <g id="phonebook_2_store_configuration_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Phonebook 2 Store Configuration Management API</text>
+        </g>
+        <g id="logs_ui_command_line_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Logs UI Command Line API</text>
+        </g>
+        <g id="speed_dial_dialogs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Speed Dial Dialogs API</text>
+        </g>
+        <g id="phonebook_2_xsp_view_activation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Phonebook 2 xSP View Activation API</text>
+        </g>
+        <g id="logs_timers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Logs Timers API</text>
+        </g>
+        <g id="phonebook_2_ui_extension_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Phonebook 2 UI Extension Definition API</text>
+        </g>
+        <g id="phonebook_2_common_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Phonebook 2 Common UI API</text>
+        </g>
+        <g id="phonebook_2_ui_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">Phonebook 2 UI Extension API</text>
+        </g>
+        <g id="phonebook_2_store_property_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Phonebook 2 Store Property API</text>
+        </g>
+        <g id="phonebook_2_ui_extension_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Phonebook 2 UI Extension Plug-In API</text>
+        </g>
+        <g id="phonebook_2_ui_controls_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">Phonebook 2 UI Controls API</text>
+        </g>
+        <g id="phonebook_2_thin_ui_extension_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">Phonebook 2 Thin UI Extension Plugin API</text>
+        </g>
+        <g id="phonebook_2_commands_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Phonebook 2 Commands API</text>
+        </g>
+        <g id="phonebook_2_presentation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Phonebook 2 Presentation API</text>
+        </g>
+        <g id="phonebook_2_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">Phonebook 2 UI Utilities API</text>
+        </g>
+        <g id="phonebook_2_contact_related_icon_customization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Phonebook 2 Contact Related Icon Customization API</text>
+        </g>
+        <g id="cca_launch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">CCA Launch API</text>
+        </g>
+        <g id="cca_view_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">CCA View Plugin API</text>
+        </g>
+        <g id="predictivesearch_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Predictive Search Client API</text>
+        </g>
+        <g id="predictivesearch_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Predictive Search Utils API</text>
+        </g>
+        <g id="predictivesearch_adapters_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">Predictive Search Adapters API</text>
+        </g>
+        <g id="predictivesearch_algorithm_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Predictive Search Algorithm API</text>
+        </g>
+        <g id="phonebook_2_rcl_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Phonebook 2 RCL API</text>
+        </g>
+       </g>
+      </g>
       <g id="contactextensions" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Contacts Exten­sions</text>
@@ -11306,7 +16467,7 @@
         </g>
        </g>
       </g>
-      <g id="logsui" transform="translate(0 0)" class="collection">
+      <g id="logsui" transform="translate(515.7000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Logs UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11317,7 +16478,7 @@
         </g>
        </g>
       </g>
-      <g id="phonebookui" transform="translate(17.7 0)" class="collection">
+      <g id="phonebookui" transform="translate(533.4000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Phone­book UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11456,35 +16617,147 @@
         </g>
        </g>
       </g>
-      <g id="contacts_info" transform="translate(47.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Contacts Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="contacts_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Contacts Apps Platform Inter­faces</text>
-        </g>
-        <g id="contacts_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Contacts Apps Public Inter­faces</text>
-        </g>
+      <g id="contacts_info" transform="translate(563.4000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Contacts Apps Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="contacts_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Contacts Apps Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="organizer" class="package" transform="translate( 593.9999999999999 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Contacts Apps Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="organizer" class="package" transform="translate( 1215.9 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="236.70000000000002" height="164.23000000000002" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="236.70000000000002" x="118.35000000000001" y="163.23000000000002">Organizer App Suite</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="311.40000000000003" height="164.23000000000002" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="311.40000000000003" x="155.70000000000002" y="163.23000000000002">Organizer App Suite</text>
+     <g transform="translate(0 3.2)">
+      <g id="organizer_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="186.00000000000006"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="184.60000000000005" height="6.299999999999999">Organizer App Suite Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="meeting_request_mailbox_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Meeting Request Mailbox Utilities API</text>
+        </g>
+        <g id="meeting_request_uids_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Meeting Request UIDs API</text>
+        </g>
+        <g id="calendar_exporter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Calendar Exporter API</text>
+        </g>
+        <g id="agenda_versit_2_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Agenda Versit 2 API</text>
+        </g>
+        <g id="calendar_importer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Calendar Importer API</text>
+        </g>
+        <g id="calendar_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Calendar Launcher API</text>
+        </g>
+        <g id="calendar_common_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Calendar Common Utils API</text>
+        </g>
+        <g id="searchfw_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Search Framework Launcher API</text>
+        </g>
+        <g id="alarm_const_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Alarm Const API</text>
+        </g>
+        <g id="alarm_ui_external_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Alarm UI External Control API</text>
+        </g>
+        <g id="calendar_settings_keys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Calendar Settings Keys API</text>
+        </g>
+        <g id="calendar_tones_settings_keys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Calendar Tones Settings Keys API</text>
+        </g>
+        <g id="clock_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Clock Settings API</text>
+        </g>
+        <g id="common_alarm_editor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Common Alarm Editor API</text>
+        </g>
+        <g id="alarm_ui_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Alarm UI Secondary Display API</text>
+        </g>
+        <g id="searchui_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Search UI Launcher API</text>
+        </g>
+        <g id="agenda_entry_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Agenda Entry UI API</text>
+        </g>
+        <g id="meeting_request_utillities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Meeting Request Utillities API</text>
+        </g>
+        <g id="meeting_request_viewer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Meeting Request Viewer API</text>
+        </g>
+        <g id="calendar_custamization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Calendar Customization API</text>
+        </g>
+       </g>
+      </g>
+      <g id="organizer_pub" transform="translate(188.10000000000005 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Organizer App Suite Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="calendar_interim_utils2_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Calendar Interim Utils 2 API</text>
+        </g>
+        <g id="notepad_library_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Notepad Library API</text>
+        </g>
+       </g>
+      </g>
       <g id="alarmengines" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Alarm Engines</text>
@@ -11571,7 +16844,7 @@
         </g>
        </g>
       </g>
-      <g id="alarmui" transform="translate(0 0)" class="collection">
+      <g id="alarmui" transform="translate(208.80000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Alarm UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11704,7 +16977,7 @@
         </g>
        </g>
       </g>
-      <g id="clock2" transform="translate(17.7 0)" class="collection">
+      <g id="clock2" transform="translate(226.50000000000006 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Clock</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11751,7 +17024,7 @@
         </g>
        </g>
       </g>
-      <g id="searchui" transform="translate(57.00000000000001 0)" class="collection">
+      <g id="searchui" transform="translate(265.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Search UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11812,36 +17085,173 @@
         </g>
        </g>
       </g>
-      <g id="organizer_info" transform="translate(87 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Organizer App Suite Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="organizer_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Organizer App Suite Public Inter­faces</text>
-        </g>
-        <g id="organizer_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Organizer App Suite Platform Inter­faces</text>
-        </g>
+      <g id="organizer_info" transform="translate(295.8 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Organizer App Suite Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="organizer_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Organizer App Suite Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="messaging" class="package" transform="translate( 832.7999999999998 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Organizer App Suite Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="messaging" class="package" transform="translate( 1529.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="139.5" height="164.23000000000002" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="139.5" x="69.75" y="163.23000000000002">Messag­ing Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="mobilemessaging" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="356.7000000000001" height="164.23000000000002" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="163.23000000000002">Messag­ing Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="msg_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Msg. Apps Public APIs</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="messaging_integration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Messaging Integration API</text>
+        </g>
+        <g id="plugin_bio_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Plug-in Bio Control API</text>
+        </g>
+        <g id="mms_client_mtm_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">MMS Client MTM API</text>
+        </g>
+        <g id="open_new_message_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Open New Message Notification API</text>
+        </g>
+        <g id="messaging_editor_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Messaging Editor Constants API</text>
+        </g>
+       </g>
+      </g>
+      <g id="msg_plat" transform="translate(48.6 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="204.60000000000008"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="203.20000000000007" height="6.299999999999999">Msg. Apps Platform APIs</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="smil_player_launch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">SMIL Player Launch API</text>
+        </g>
+        <g id="messaging_media_resolver_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Messaging Media Resolver API</text>
+        </g>
+        <g id="smil_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SMIL Engine API</text>
+        </g>
+        <g id="mms_server_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">MMS Server Settings API</text>
+        </g>
+        <g id="new_contacts_note_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">New Contacts Note Secondary Display API</text>
+        </g>
+        <g id="messaging_center_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Messaging Center UI Utilities API</text>
+        </g>
+        <g id="internet_mail_mtm_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Internet Mail MTM UI API</text>
+        </g>
+        <g id="messaging_editor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Messaging Editor API</text>
+        </g>
+        <g id="email_domain_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Email Domain Utilities API</text>
+        </g>
+        <g id="smil_transition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">SMIL Transition API</text>
+        </g>
+        <g id="new_contacts_note_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">New Contacts Note Status API</text>
+        </g>
+        <g id="unified_editor_video_conversion_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Unified Editor Video Conversion API</text>
+        </g>
+        <g id="mms_conformance_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">MMS Conformance API</text>
+        </g>
+        <g id="new_contacts_note_variables_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">New Contacts Note Variables API</text>
+        </g>
+        <g id="new_message_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">New Message Notification API</text>
+        </g>
+        <g id="mms_application_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">MMS Application API</text>
+        </g>
+        <g id="mms_engine_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">MMS Engine Settings API</text>
+        </g>
+        <g id="mms_codec_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">MMS Codec Client API</text>
+        </g>
+        <g id="send_ui_meeting_request_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Send UI Meeting Request API</text>
+        </g>
+        <g id="new_contact_notes_extended_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">New Contact Notes Extended API</text>
+        </g>
+        <g id="mail_ui_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Mail UI Constants API</text>
+        </g>
+        <g id="sim_dialog_launch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">SIM Dialog Launch API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mobilemessaging" transform="translate(255.30000000000007 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Mobile Messag­ing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -12097,35 +17507,57 @@
         </g>
        </g>
       </g>
-      <g id="messaging_info" transform="translate(85.79999999999998 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Messag­ing Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="msg_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Msg. Apps Platform APIs</text>
-        </g>
-        <g id="msg_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Msg. Apps Public APIs</text>
-        </g>
+      <g id="messaging_info" transform="translate(341.1000000000001 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Messag­ing Apps Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="messaging_metadata" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Msg. Apps Metadata</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="commonemail" class="package" transform="translate( 974.3999999999999 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Msg. Apps Metadata</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="commonemail" class="package" transform="translate( 1888.2000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="158.10000000000002" height="164.23000000000002" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="158.10000000000002" x="79.05000000000001" y="163.23000000000002">Email Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="email_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Email Apps Public Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="email_widget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Email Widget API</text>
+        </g>
+       </g>
+      </g>
+      <g id="email_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Email Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="email_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Email Client API</text>
+        </g>
+        <g id="email_setup_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Email Setup Plugin API</text>
+        </g>
+        <g id="email_crkeys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Email CenRep Keys API</text>
+        </g>
+       </g>
+      </g>
       <g id="emailservices" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Email Services</text>
@@ -12310,7 +17742,7 @@
         </g>
        </g>
       </g>
-      <g id="emailuis" transform="translate(0 0)" class="collection">
+      <g id="emailuis" transform="translate(47.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Email UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -12342,9 +17774,9 @@
         </g>
        </g>
       </g>
-      <g id="commonemail_info" transform="translate(48.6 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Email Apps Info</text>
+      <g id="commonemail_info" transform="translate(96.3 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Email Apps Info</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="emailhelp" class="component placeholder">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -12358,25 +17790,36 @@
          <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Email Help</text>
         </g>
-        <g id="email_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Email Apps Platform Inter­faces</text>
-        </g>
-        <g id="email_pub" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Email Apps Public Interfaces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="conversations" class="package" transform="translate( 1134.5999999999997 0)">
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="conversations" class="package" transform="translate( 2048.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="115.8" height="82.63000000000001" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="115.8" x="57.9" y="81.63000000000001">Conversa­tion Apps</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="142.8" height="82.63000000000001" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="142.8" x="71.4" y="81.63000000000001">Conversa­tion Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="conversations_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Conversa­tion Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="im_cv_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IM CV Launcher API</text>
+        </g>
+        <g id="im_connection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">IM Connection API</text>
+        </g>
+        <g id="im_cv_appui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">IM CV App UI API</text>
+        </g>
+       </g>
+      </g>
       <g id="uiservicetabsettings" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">UI Service Tab Settings</text>
@@ -12430,7 +17873,7 @@
         </g>
        </g>
       </g>
-      <g id="uiservicetab" transform="translate(0 0)" class="collection">
+      <g id="uiservicetab" transform="translate(30.000000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">UI Service Tab</text>
        <g transform="translate(0 6.299999999999999)">
@@ -12471,7 +17914,7 @@
         </g>
        </g>
       </g>
-      <g id="servicewidget" transform="translate(67.19999999999999 0)" class="collection">
+      <g id="servicewidget" transform="translate(97.2 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Service Widget</text>
        <g transform="translate(0 6.299999999999999)">
@@ -12514,29 +17957,35 @@
         </g>
        </g>
       </g>
-      <g id="conversations_info" transform="translate(97.2 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Conversa­tion Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="conversations_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Conversa­tion Apps Platform Inter­faces</text>
-        </g>
+      <g id="conversations_info" transform="translate(127.2 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Conversa­tion Apps Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="conversations_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Conversa­tion Apps Build</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="im" class="package" transform="translate( 1252.4999999999998 0)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Conversa­tion Apps Build</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="im" class="package" transform="translate( 2193.3 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Instant Msg. Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="im_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Instant Msg. Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wv_sap_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">WV SAP Settings API</text>
+        </g>
+       </g>
+      </g>
       <g id="wvsettings20" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Wireless Village Settings Eng.</text>
@@ -12548,25 +17997,25 @@
         </g>
        </g>
       </g>
-      <g id="im_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Instant Msg. Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="im_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Instant Msg. Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="dictionary" class="package" transform="translate( 1134.5999999999997 85.83000000000001)">
+     </g>
+    </g>
+    <g id="dictionary" class="package" transform="translate( 2048.4000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="78.4" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="77.4">Dictio­nary</text>
      <g transform="translate(0 3.2)">
-      <g id="userdict" transform="translate(0 0)" class="collection">
+      <g id="dictionary_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Dictio­nary Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="menu_suites_macros_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Menu Suites Macros API</text>
+        </g>
+       </g>
+      </g>
+      <g id="userdict" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">User Dictio­nary</text>
        <g transform="translate(0 6.299999999999999)">
@@ -12577,25 +18026,30 @@
         </g>
        </g>
       </g>
-      <g id="dictionary_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Dictio­nary Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="dictionary_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Dictio­nary Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="camera" class="package" transform="translate( 1282.4999999999998 0)">
+     </g>
+    </g>
+    <g id="camera" class="package" transform="translate( 2223.3 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="36.300000000000004" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="81.63000000000001">Camera Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="camerauis" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="57.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="81.63000000000001">Camera Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="camera_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Camera Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="camcorder_ui_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Camcorder UI Constants API</text>
+        </g>
+        <g id="active_palette_2_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Active Palette 2 API</text>
+        </g>
+       </g>
+      </g>
+      <g id="camerauis" transform="translate(20.700000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Camera UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -12611,25 +18065,50 @@
         </g>
        </g>
       </g>
-      <g id="camera_info" transform="translate(20.700000000000003 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Camera Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="camera_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Camera Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="imgeditor" class="package" transform="translate( 1320.8999999999999 0)">
+      <g id="camera_info" transform="translate(41.400000000000006 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera Apps Info</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+     </g>
+    </g>
+    <g id="imgeditor" class="package" transform="translate( 2282.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="92.09999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="92.09999999999998" x="46.04999999999999" y="81.63000000000001">Image Editor Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="imageeditor" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="122.99999999999999" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Image Editor Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="imgeditor_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Image Editor Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="image_editor_debug_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Image Editor Debug Utilities API</text>
+        </g>
+        <g id="image_editor_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Image Editor Utilities API</text>
+        </g>
+        <g id="image_editor_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Image Editor Definitions API</text>
+        </g>
+        <g id="image_editor_system_parameters_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Image Editor System Parameters API</text>
+        </g>
+        <g id="image_processing_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Image Processing Engine API</text>
+        </g>
+       </g>
+      </g>
+      <g id="imageeditor" transform="translate(48.6 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Image Editor UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -12706,25 +18185,25 @@
         </g>
        </g>
       </g>
-      <g id="imgeditor_info" transform="translate(76.49999999999999 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Image Editor Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="imgeditor_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Image Editor Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="videoeditor" class="package" transform="translate( 1415.1 0)">
+     </g>
+    </g>
+    <g id="videoeditor" class="package" transform="translate( 2407.5 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="82.79999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="82.79999999999998" x="41.39999999999999" y="81.63000000000001">Video Editor Apps</text>
      <g transform="translate(0 3.2)">
-      <g id="videditor" transform="translate(0 0)" class="collection">
+      <g id="videoeditor_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Editor Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="video_editor_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Engine API</text>
+        </g>
+       </g>
+      </g>
+      <g id="videditor" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Video Editor</text>
        <g transform="translate(0 6.299999999999999)">
@@ -12807,24 +18286,34 @@
         </g>
        </g>
       </g>
-      <g id="videoeditor_info" transform="translate(67.19999999999999 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Editor Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="videoeditor_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="videoplayer" class="package" transform="translate( 1500 0)">
+     </g>
+    </g>
+    <g id="videoplayer" class="package" transform="translate( 2492.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="206.70000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="206.70000000000002" x="103.35000000000001" y="81.63000000000001">Video Player Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="videoplayer_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Video Player Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="videoplayer_startup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Player Startup API</text>
+        </g>
+        <g id="video_player_file_details_dialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Media Player File Details Dialog API</text>
+        </g>
+        <g id="videocollection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Video Collection API</text>
+        </g>
+       </g>
+      </g>
       <g id="videofeeds" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="167.40000000000003"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="166.00000000000003" height="6.299999999999999">Video Feeds</text>
@@ -13001,7 +18490,7 @@
         </g>
        </g>
       </g>
-      <g id="videoplayerapp" transform="translate(0 0)" class="collection">
+      <g id="videoplayerapp" transform="translate(30.000000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Video Player App</text>
        <g transform="translate(0 6.299999999999999)">
@@ -13053,25 +18542,45 @@
         </g>
        </g>
       </g>
-      <g id="videoplayer_info" transform="translate(30.000000000000004 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Player Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="videoplayer_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Player Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="photos" class="package" transform="translate( 1708.8 0)">
+     </g>
+    </g>
+    <g id="photos" class="package" transform="translate( 2701.2000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="166.5" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="166.5" x="83.25" y="81.63000000000001">Photos</text>
-     <g transform="translate(0 3.2)">
-      <g id="photosgallery" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="197.4" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="197.4" x="98.7" y="81.63000000000001">Photos</text>
+     <g transform="translate(0 3.2)">
+      <g id="photos_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Photos Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="collection_plugins_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Collection Plugins API</text>
+        </g>
+        <g id="controllers_collection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Controllers Collection API</text>
+        </g>
+        <g id="gallery_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Gallery Utilities API</text>
+        </g>
+        <g id="slideshow_ui_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Slideshow Ui Constants API</text>
+        </g>
+        <g id="views_metadatadialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Views Metadata Dialog API</text>
+        </g>
+       </g>
+      </g>
+      <g id="photosgallery" transform="translate(48.6 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="148.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="147.4" height="6.299999999999999">Photos Gallery</text>
        <g transform="translate(0 6.299999999999999)">
@@ -13157,25 +18666,65 @@
         </g>
        </g>
       </g>
-      <g id="photos_info" transform="translate(150.9 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Photos Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="photos_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Photos Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="musicplayer" class="package" transform="translate( 1877.3999999999999 0)">
+     </g>
+    </g>
+    <g id="musicplayer" class="package" transform="translate( 2900.7000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="76.5" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="76.5" x="38.25" y="81.63000000000001">Music Player Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="mpxmusicplayer" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="159.29999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="81.63000000000001">Music Player Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="musicplayer_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Music Player Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="mpx_music_player_app_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">MPX Music Player App API</text>
+        </g>
+        <g id="mpx_music_player_commonui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">MPX Music Player Common UI API</text>
+        </g>
+        <g id="mpx_music_player_media_key_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">MPX Music Player Media Key Handler API</text>
+        </g>
+        <g id="mpx_music_player_remote_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">MPX Music Player Remote Control API</text>
+        </g>
+        <g id="mpx_music_shop_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">MPX Music Shop UI API</text>
+        </g>
+        <g id="mpx_music_wap_adapter_cenrep_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">MPX Music Wap Adapter CenRep API</text>
+        </g>
+        <g id="mpx_music_store_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">MPX Music Store Find API</text>
+        </g>
+        <g id="audio_application_features_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Audio Application Features API</text>
+        </g>
+        <g id="music_content_publisher_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Music Content Publisher Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mpxmusicplayer" transform="translate(85.79999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">MPX Music Player</text>
        <g transform="translate(0 6.299999999999999)">
@@ -13273,25 +18822,20 @@
         </g>
        </g>
       </g>
-      <g id="musicplayer_info" transform="translate(57.9 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Music Player Apps Info</text>
+      <g id="musicplayer_info" transform="translate(143.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Music Player Apps Info</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="musicplayer_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Music Player Build</text>
         </g>
-        <g id="musicplayer_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Music Player Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="radio" class="package" transform="translate( 1955.9999999999998 0)">
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="radio" class="package" transform="translate( 3062.1000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="65.1" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="81.63000000000001">Radio Apps</text>
@@ -13339,24 +18883,40 @@
       </g>
      </g>
     </g>
-    <g id="internetradio" class="package placeholder" transform="translate( 2023.1999999999998 0)">
+    <g id="internetradio" class="package placeholder" transform="translate( 3129.3 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="tv" class="package placeholder" transform="translate( 1169.9999999999998 85.83000000000001)">
+    <g id="tv" class="package placeholder" transform="translate( 2083.8 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">TV Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="voicerec" class="package" transform="translate( 2103.2999999999997 0)">
+    <g id="voicerec" class="package" transform="translate( 3209.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Voice Recorder Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="voicerecorder" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="54.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="54.00000000000001" x="27.000000000000004" y="81.63000000000001">Voice Recorder Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="voicerec_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Voice Recorder Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="new_file_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">New File Service API</text>
+        </g>
+        <g id="voicerecorder_public_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Voice Recorder Public Constants API</text>
+        </g>
+       </g>
+      </g>
+      <g id="voicerecorder" transform="translate(20.700000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Voice Recorder</text>
        <g transform="translate(0 6.299999999999999)">
@@ -13367,20 +18927,14 @@
         </g>
        </g>
       </g>
-      <g id="voicerec_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Voice Recorder Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="voicerec_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Voice Recorder Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="screensaver" class="package" transform="translate( 2138.7 0)">
+      <g id="voicerec_info" transform="translate(38.400000000000006 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice Recorder Apps Info</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+     </g>
+    </g>
+    <g id="screensaver" class="package" transform="translate( 3265.5 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -13422,12 +18976,33 @@
       </g>
      </g>
     </g>
-    <g id="homescreen" class="package" transform="translate( 2168.7 0)">
+    <g id="homescreen" class="package" transform="translate( 3295.5 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="110.69999999999997" height="82.63000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="110.69999999999997" x="55.34999999999999" y="81.63000000000001">Home Screen Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="idlehomescreen" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="122.99999999999999" height="82.63000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Home Screen Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="homescreen_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Home Screen Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="menu_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Menu Settings API</text>
+        </g>
+        <g id="hs_content_control_ui" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HS Content Control Ui</text>
+        </g>
+        <g id="hs_renderingplugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HS Rendering Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="idlehomescreen" transform="translate(30.000000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="92.99999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="91.59999999999998" height="6.299999999999999">Idle Home Screen</text>
        <g transform="translate(0 6.299999999999999)">
@@ -13525,36 +19100,35 @@
         </g>
        </g>
       </g>
-      <g id="homescreen_info" transform="translate(95.09999999999998 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Home Screen Apps Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="homescreen_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Home Screen Apps Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="graphicsuis" class="package" transform="translate( 1250.0999999999997 85.83000000000001)">
+     </g>
+    </g>
+    <g id="graphicsuis" class="package" transform="translate( 2163.9 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="78.4" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="77.4">Graphics UIs</text>
-     <g transform="translate(0 3.2)">
-      <g id="graphicsuis_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Graphics UIs Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="graphicsuis_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Graphics UIs Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-      <g id="svgtviewer" transform="translate(17.7 0)" class="collection">
+     <rect class="package" x="0" width="45.6" height="78.4" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="45.6" x="22.8" y="77.4">Graphics UIs</text>
+     <g transform="translate(0 3.2)">
+      <g id="graphicsuis_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Graphics UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="svgt_viewer_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">SVG-T Viewer UI API</text>
+        </g>
+        <g id="svg_application_observer_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">SVG Application Observer Utility API</text>
+        </g>
+        <g id="svgt_file_view_details_dialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SVG-T File View Details Dialog API</text>
+        </g>
+       </g>
+      </g>
+      <g id="svgtviewer" transform="translate(30.000000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SVG-T Viewer</text>
        <g transform="translate(0 6.299999999999999)">
@@ -13567,12 +19141,23 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 2281.5 0)">
+    <g id="profile" class="package" transform="translate( 3420.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="36.300000000000004" height="82.63000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="81.63000000000001">Profiles</text>
-     <g transform="translate(0 3.2)">
-      <g id="profilesapplication" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
+     <g transform="translate(0 3.2)">
+      <g id="profile_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Profiles Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="profiles_settings_view_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Profiles Settings View API</text>
+        </g>
+       </g>
+      </g>
+      <g id="profilesapplication" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Profiles App</text>
        <g transform="translate(0 6.299999999999999)">
@@ -13583,30 +19168,166 @@
         </g>
        </g>
       </g>
-      <g id="profile_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Profiles Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="profile_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Profiles Platform Inter­faces</text>
-        </g>
+      <g id="profile_info" transform="translate(35.4 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Profiles Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="profile_help" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Profiles Help</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="speechsrv" class="package" transform="translate( 1285.4999999999998 85.83000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Profiles Help</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="speechsrv" class="package" transform="translate( 2211.6 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="195.30000000000007" height="78.4" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="195.30000000000007" x="97.65000000000003" y="77.4">Speech Recog­nition UIs</text>
-     <g transform="translate(0 3.2)">
-      <g id="voiceui" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="326.70000000000016" height="78.4" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="326.70000000000016" x="163.35000000000008" y="77.4">Speech Recog­nition UIs</text>
+     <g transform="translate(0 3.2)">
+      <g id="speechsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="251.10000000000014"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="249.70000000000013" height="6.299999999999999">Speech Recog­nition UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="vas_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">VAS API</text>
+        </g>
+        <g id="nss_devasr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">NSS DevASR API</text>
+        </g>
+        <g id="tts_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">TTS HW Device API</text>
+        </g>
+        <g id="voice_commands_resource_header_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Voice Commands Resource Header API</text>
+        </g>
+        <g id="nss_mmf_tts_custom_commands_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">NSS MMF TTS Custom Commands API</text>
+        </g>
+        <g id="srsf_cenrep_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">SRSF CenRep Settings API</text>
+        </g>
+        <g id="voice_ui_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Voice UI Plug-in API</text>
+        </g>
+        <g id="nss_tts_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">NSS TTS Utility API</text>
+        </g>
+        <g id="nss_srs_custom_commands_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">NSS SRS Custom Commands API</text>
+        </g>
+        <g id="srsf_secondarydisplay_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">SRSF Secondary Display API</text>
+        </g>
+        <g id="asrs_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">ASRS Hardware Device API</text>
+        </g>
+        <g id="vas_vcommand_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">VAS Voice Command API</text>
+        </g>
+        <g id="adaptation_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Adaptation Hardware Device API</text>
+        </g>
+        <g id="nss_devtts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">NSS DevTTS API</text>
+        </g>
+        <g id="nss_srs_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">NSS SRS Utility API</text>
+        </g>
+        <g id="recognition_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Recognition Hardware Device API</text>
+        </g>
+        <g id="vas_contact_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">VAS Contact Handler API</text>
+        </g>
+        <g id="nlp_hw_device" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">NLP Hardware Device</text>
+        </g>
+        <g id="nss_si_speech_recognition_data_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">NSS SI Speech Recognition Data API</text>
+        </g>
+        <g id="nss_tts_common_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">NSS TTS Common API</text>
+        </g>
+        <g id="grcompiler_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Grammar Compiler Hardware Device API</text>
+        </g>
+        <g id="ttp_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">TTP Hardware Device API</text>
+        </g>
+        <g id="vocman_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">VocMan Hardware Device API</text>
+        </g>
+        <g id="speech_synthesis_clientserver_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Speech Synthesis Client-Server API</text>
+        </g>
+        <g id="voice_ui_accessory_button_handling_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Voice UI Accessory Button Handling API</text>
+        </g>
+        <g id="ui_voice_recognition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">UI Voice Recognition API</text>
+        </g>
+        <g id="vcommand_settings_cenrep_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Voice Command Settings CenRep API</text>
+        </g>
+       </g>
+      </g>
+      <g id="voiceui" transform="translate(253.20000000000013 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Voice UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -13754,20 +19475,14 @@
         </g>
        </g>
       </g>
-      <g id="speechsrv_info" transform="translate(57.9 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Speech Recog­nition UIs Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="speechsrv_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Speech Recog­nition UIs Platform Inter­faces</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="homescreentools" class="package" transform="translate( 1482.8999999999999 85.83000000000001)">
+      <g id="speechsrv_info" transform="translate(311.10000000000014 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Speech Recog­nition UIs Info</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+     </g>
+    </g>
+    <g id="homescreentools" class="package" transform="translate( 2540.4 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="54" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="54" x="27" y="77.4">Home Screen Tools</text>
@@ -13812,7 +19527,7 @@
       </g>
      </g>
     </g>
-    <g id="webuis" class="package" transform="translate( 1538.9999999999998 85.83000000000001)">
+    <g id="webuis" class="package" transform="translate( 2596.5 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="67.2" height="78.4" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="67.2" x="33.6" y="77.4">Web UIs</text>
@@ -13889,11 +19604,32 @@
       </g>
      </g>
     </g>
-    <g id="jrt" class="package" transform="translate( 1608.2999999999997 85.83000000000001)">
+    <g id="jrt" class="package" transform="translate( 2665.8 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="37.2" height="78.4" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="37.2" x="18.6" y="48.6" dy="0.375em">Java Runtime</text>
      <g transform="translate(0 3.2)">
+      <g id="jrt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">JRT Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="java_registry_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Java Registry API</text>
+        </g>
+        <g id="java_env_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Java Environment Info API</text>
+        </g>
+        <g id="java_debug_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Java Debug API</text>
+        </g>
+       </g>
+      </g>
       <g id="java_stubs" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Java Stubs</text>
@@ -13925,24 +19661,19 @@
        </g>
       </g>
       <g id="jrt_info" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">JRT Info</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="jrt_plat" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">JRT Platform Interfaces</text>
-        </g>
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">JRT Info</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="jrt_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">JRT Build</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="conntools" class="package" transform="translate( 1647.5999999999997 85.83000000000001)">
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">JRT Build</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="conntools" class="package" transform="translate( 2705.1000000000004 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="78.4" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="77.4">Connect­ivity Tools</text>
@@ -13973,7 +19704,7 @@
       </g>
      </g>
     </g>
-    <g id="rndtools" class="package" transform="translate( 1677.5999999999997 85.83000000000001)">
+    <g id="rndtools" class="package" transform="translate( 2735.1000000000004 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="103.5" height="78.4" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="87.9" x="59.55" y="67.4" dy="0.375em">R&amp;D tools</text>
@@ -14144,7 +19875,7 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 2319.9 0)">
+    <g id="helps" class="package" transform="translate( 3473.7 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="164.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="163.23000000000002">Help Apps</text>
@@ -14185,7 +19916,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 2349.9 0)">
+    <g id="techview" class="package" transform="translate( 3503.7 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="68.7" height="164.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="163.23000000000002">Techview</text>
@@ -14300,7 +20031,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(2120.1795000000006 641.7200000000003) translate(317.6205 0) scale(6.140157829862999) translate(-317.6205)">
+ <g id="legend-root" class="legend" transform="translate(4844.779499999998 633.2600000000001) translate(317.6205 0) scale(13.002687169121636) translate(-317.6205)">
   <text text-anchor="middle" class="title" x="301.28525" y="0">
    <tspan dy="0.75em" x="301.28525">Symbian OS ^3</tspan>
    <tspan dy="1em" x="301.28525">System Model</tspan>
@@ -14400,7 +20131,7 @@
       <g id="s4-overlay0" class="cmp placeholder">
        <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
        <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (171)</text>
+       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (169)</text>
       </g>
      </g>
     </g>
@@ -14434,8 +20165,8 @@
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
      <tspan dy="-1em" x="265.17499999999995">110 Packages</tspan>
-     <tspan dy="1em" x="265.17499999999995">588 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">1860 Components</tspan>
+     <tspan dy="1em" x="265.17499999999995">663 Collections</tspan>
+     <tspan dy="1em" x="265.17499999999995">2918 Components</tspan>
     </text>
    </g>
   </g>
--- a/symbian3/single/sysdefs/sf3c.svg	Thu Mar 18 11:43:11 2010 +0000
+++ b/symbian3/single/sysdefs/sf3c.svg	Fri Mar 19 14:46:47 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 1100 689.8118117952596" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 1365.4999999999998 685.1661644863985" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: %d %b %Y</title>
  <defs>
   <style type="text/css">
@@ -428,16 +428,16 @@
 ]]><![CDATA[		
  		}
 	]]></script>
- <g id="os" transform="translate(3.1999999999999993 412.52)" class="layer">
-  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
-  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
-  <g class="layer-detail" transform="translate(27.05 3.2)">
-   <rect x="-14.25" class="layer" y="-3.2" width="1077.6" height="231.26000000000002"/>
+ <g id="os" transform="translate(3.1999999999999993 404.06)" class="layer">
+  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="227.03"/>
+  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="227.03" height="9.3" x="-113.815">OS</text>
+  <g class="layer-detail" transform="translate(57.04999999999988 3.2)">
+   <rect x="-44.249999999999886" class="layer" y="-3.2" width="1343.0999999999997" height="227.03"/>
    <g>
-    <g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
+    <g id="kernelhwsrv" class="package" transform="translate( 0 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
      <rect class="package" x="0" width="68.7" height="101.43" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.42999999999999">Kernel &amp; HW Services</text>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.43">Kernel &amp; HW Services</text>
      <g transform="translate(0 3.2)">
       <g id="brdbootldr" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -501,10 +501,10 @@
       </g>
      </g>
     </g>
-    <g id="boardsupport" class="package" transform="translate( 70.8 123.43000000000002)">
+    <g id="boardsupport" class="package" transform="translate( 70.8 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.42999999999999">Board Support</text>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Board Support</text>
      <g transform="translate(0 3.2)">
       <g id="emulator" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -523,10 +523,10 @@
       </g>
      </g>
     </g>
-    <g id="buildtools" class="package" transform="translate( 100.8 123.43000000000002)">
+    <g id="buildtools" class="package" transform="translate( 100.8 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.42999999999999">Build Tools</text>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Build Tools</text>
      <g transform="translate(0 3.2)">
       <g id="bldsystemtools" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -562,9 +562,19 @@
     </g>
     <g id="ossrv" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="86.4" height="120.23000000000002" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="86.4" x="43.2" y="119.23000000000002">Generic OS Services</text>
+     <rect class="package" x="0" width="121.79999999999998" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="121.79999999999998" x="60.89999999999999" y="105" dy="0.375em">Generic OS Services</text>
      <g transform="translate(0 3.2)">
+      <g id="ossrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic OS Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="ossrv_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic OS Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="stdlibs" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Standard Libraries</text>
@@ -575,7 +585,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SSL</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="glib" transform="translate(0 0)" class="collection">
+      <g id="glib" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">GLib</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -585,7 +595,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">C++ Standard Library</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="ofdbus" transform="translate(17.7 0)" class="collection">
+      <g id="ofdbus" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Found­ation D-Bus</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -595,12 +605,12 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Utility Libraries</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="genericservices" transform="translate(35.4 0)" class="collection">
+      <g id="genericservices" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic Services</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="syslibsapitest" transform="translate(53.099999999999994 0)" class="collection placeholder">
+      <g id="syslibsapitest" transform="translate(88.5 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SysLibs API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -620,17 +630,17 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Low Level Libs &amp; Fmwks.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="ossrv_info" transform="translate(70.8 0)" class="collection">
+      <g id="ossrv_info" transform="translate(106.19999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic OS Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="persistentdata" class="package" transform="translate( 88.5 0)">
+    <g id="persistentdata" class="package" transform="translate( 123.89999999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23000000000002">Persistent Data Services</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">Persistent Data Services</text>
      <g transform="translate(0 3.2)">
       <g id="featuremgmt" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -659,17 +669,27 @@
       </g>
      </g>
     </g>
-    <g id="devicesrv" class="package" transform="translate( 123.9 0)">
+    <g id="devicesrv" class="package" transform="translate( 159.29999999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="86.4" height="120.23000000000002" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="86.4" x="43.2" y="119.23000000000002">Dev­ice Services</text>
+     <rect class="package" x="0" width="121.79999999999998" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="121.79999999999998" x="60.89999999999999" y="105" dy="0.375em">Dev­ice Services</text>
      <g transform="translate(0 3.2)">
+      <g id="devicesrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Dev­ice Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="devicesrv_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Dev­ice Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="accessoryservices" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Accessory Services</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="commonservices" transform="translate(0 0)" class="collection">
+      <g id="commonservices" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Common Services</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -689,12 +709,12 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">HWRM Haptics</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mediator" transform="translate(17.7 0)" class="collection">
+      <g id="mediator" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Mediator</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="psmservices" transform="translate(35.4 0)" class="collection">
+      <g id="psmservices" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Power Save Mode Services</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -719,22 +739,22 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">System Health Mgmt.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="devicesrvapitest" transform="translate(53.099999999999994 0)" class="collection placeholder">
+      <g id="devicesrvapitest" transform="translate(88.5 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Devices Services API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="devicesrv_info" transform="translate(70.8 0)" class="collection">
+      <g id="devicesrv_info" transform="translate(106.19999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Dev­ice Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="security" class="package" transform="translate( 212.4 0)">
+    <g id="security" class="package" transform="translate( 283.2 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">OS Security</text>
+     <rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="105" dy="0.375em">OS Security</text>
      <g transform="translate(0 3.2)">
       <g id="authenticationservices" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -783,10 +803,10 @@
       </g>
      </g>
     </g>
-    <g id="lbs" class="package" transform="translate( 283.20000000000005 0)">
+    <g id="lbs" class="package" transform="translate( 354 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Locating Services</text>
+     <rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="115.00000000000001">Locating Services</text>
      <g transform="translate(0 3.2)">
       <g id="datasourcemodules" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -830,10 +850,10 @@
       </g>
      </g>
     </g>
-    <g id="commsfw" class="package" transform="translate( 354.00000000000006 0)">
+    <g id="commsfw" class="package" transform="translate( 424.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">Comms Frame­work</text>
+     <rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000001">Comms Frame­work</text>
      <g transform="translate(0 3.2)">
       <g id="commsprocess" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -882,10 +902,10 @@
       </g>
      </g>
     </g>
-    <g id="networkingsrv" class="package" transform="translate( 407.1000000000001 0)">
+    <g id="networkingsrv" class="package" transform="translate( 477.90000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Network­ing Services</text>
+     <rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="105" dy="0.375em">Network­ing Services</text>
      <g transform="translate(0 3.2)">
       <g id="esockapiextensions" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -944,31 +964,41 @@
       </g>
      </g>
     </g>
-    <g id="wlan" class="package" transform="translate( 477.9000000000001 0)">
+    <g id="wlan" class="package" transform="translate( 548.7 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23000000000002">WLAN</text>
+     <rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="86.2" dy="0.375em">WLAN</text>
      <g transform="translate(0 3.2)">
+      <g id="wlan_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="wlan_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="wlan_bearer" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Bearer</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="wlanapitest" transform="translate(0 0)" class="collection placeholder">
+      <g id="wlanapitest" transform="translate(35.4 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="wlan_info" transform="translate(17.7 0)" class="collection">
+      <g id="wlan_info" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="cellularsrv" class="package" transform="translate( 513.3000000000001 0)">
+    <g id="cellularsrv" class="package" transform="translate( 619.5 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:darkkhaki;"/>
+     <rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="35.4" x="33.3" y="86.2" dy="0.375em">Cellular Baseband Services</text>
      <g transform="translate(0 3.2)">
       <g id="basebandabstraction" transform="translate(0 75.2)" class="collection">
@@ -981,11 +1011,6 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Baseband Adapt. Plugins</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="fax" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Fax</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
       <g id="smsprotocols" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SMS Protocols</text>
@@ -996,7 +1021,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony Protocols</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="telephonyserver" transform="translate(17.7 18.8)" class="collection">
+      <g id="telephonyserver" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony Server</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1028,11 +1053,16 @@
       </g>
      </g>
     </g>
-    <g id="bt" class="package" transform="translate( 566.4000000000001 0)">
+    <g id="bt" class="package" transform="translate( 672.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">Blue­tooth</text>
+     <rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="105" dy="0.375em">Blue­tooth</text>
      <g transform="translate(0 3.2)">
+      <g id="bt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Bluetooth Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="bluetooth" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Blue­tooth Core</text>
@@ -1043,7 +1073,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Blue­tooth Manage­ment</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="bluetoothcommsprofiles" transform="translate(0 0)" class="collection">
+      <g id="bluetoothcommsprofiles" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Btooth. Comms Profiles</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1058,7 +1088,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IrDA</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="bluetoothapitest" transform="translate(17.7 0)" class="collection placeholder">
+      <g id="bluetoothapitest" transform="translate(35.4 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Blue­tooth API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1068,18 +1098,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">AT Extensions</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="bt_info" transform="translate(35.4 0)" class="collection">
+      <g id="bt_info" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Blue­tooth Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="usb" class="package" transform="translate( 619.5000000000001 0)">
+    <g id="usb" class="package" transform="translate( 743.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23000000000002">USB</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">USB</text>
      <g transform="translate(0 3.2)">
+      <g id="usb_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="usbldd" transform="translate(0 75.2)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Logical Dev­ice Drivers</text>
@@ -1090,18 +1125,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Manage­ment</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="usb_info" transform="translate(0 0)" class="collection">
+      <g id="usb_info" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="mm" class="package" transform="translate( 649.5000000000001 0)">
+    <g id="mm" class="package" transform="translate( 778.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="86.4" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="86.4" x="43.2" y="119.23000000000002">Multi­media</text>
+     <rect class="package" x="0" width="86.4" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="70.80000000000001" x="51" y="86.2" dy="0.375em">Multi­media</text>
      <g transform="translate(0 3.2)">
+      <g id="mm_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="mm_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="devsoundextensions" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Devsound Exten­sions</text>
@@ -1122,7 +1167,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Codecs</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imagingandcamerafws" transform="translate(0 0)" class="collection">
+      <g id="imagingandcamerafws" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Imaging &amp; Camera Fmwks.</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1137,7 +1182,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multi­media Plugins</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mm_info" transform="translate(17.7 0)" class="collection">
+      <g id="mm_info" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multi­media Info</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1177,19 +1222,29 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM HW Adapt. Inter­faces</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mmapitest" transform="translate(35.4 0)" class="collection">
+      <g id="mmapitest" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multi­media API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="imagingext" class="package" transform="translate( 738.0000000000001 0)">
+    <g id="imagingext" class="package" transform="translate( 867.3 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23000000000002">Imaging Exten­sions</text>
+     <rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="105" dy="0.375em">Imaging Exten­sions</text>
      <g transform="translate(0 3.2)">
-      <g id="imageadaptationextensions" transform="translate(0 0)" class="collection">
+      <g id="imagingext_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Imaging Ext. Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="imagingext_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Imaging Ext. Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="imageadaptationextensions" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Adapt. Ext.</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1199,17 +1254,12 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Imaging Modules</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imagingext_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Imaging Ext. Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="graphics" class="package" transform="translate( 773.4000000000001 0)">
+    <g id="graphics" class="package" transform="translate( 920.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="86.4" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="86.4" x="43.2" y="119.23000000000002">Graphics</text>
+     <rect class="package" x="0" width="104.1" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="88.5" x="59.849999999999994" y="29.8" dy="0.375em">Graphics</text>
      <g transform="translate(0 3.2)">
       <g id="graphicsaccelaration" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -1246,17 +1296,22 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics Test</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="graphics_info" transform="translate(17.7 0)" class="collection">
+      <g id="graphics_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="graphics_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="windowing" transform="translate(35.4 0)" class="collection">
+      <g id="windowing" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Windowing</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="printingservices" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="printingservices" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Printing Services</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1291,18 +1346,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics Tools</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="graphicsapitest" transform="translate(70.8 0)" class="collection placeholder">
+      <g id="graphicsapitest" transform="translate(88.5 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 861.9000000000001 0)">
+    <g id="textandloc" class="package" transform="translate( 1026.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23000000000002">Text &amp; Localis­ation Services</text>
+     <rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="115.00000000000001">Text &amp; Localis­ation Services</text>
      <g transform="translate(0 3.2)">
+      <g id="textandloc_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text &amp; Localis­ation Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="textandloc_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text &amp; Localis­ation Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="charconvfw" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Character Conver­sion</text>
@@ -1313,7 +1378,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Font &amp; Text Services</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="textlayout" transform="translate(0 0)" class="collection">
+      <g id="textlayout" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text Layout</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1333,18 +1398,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text &amp; Localis­ation Tools</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="textandloc_info" transform="translate(17.7 0)" class="collection">
+      <g id="textandloc_info" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text &amp; Localis­ation Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="xmlsrv" class="package" transform="translate( 897.3000000000001 0)">
+    <g id="xmlsrv" class="package" transform="translate( 1097.3999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23000000000002">XML Services</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000001">XML Services</text>
      <g transform="translate(0 3.2)">
+      <g id="xmlsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="xmlsecurityengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML Security Engine</text>
@@ -1355,17 +1425,17 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="xmlsrv_info" transform="translate(0 0)" class="collection">
+      <g id="xmlsrv_info" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 927.3000000000001 0)">
+    <g id="deviceplatformrelease" class="package" transform="translate( 1132.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23000000000002">Dev­ice Platform Release</text>
+     <rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="115.00000000000001">Dev­ice Platform Release</text>
      <g transform="translate(0 3.2)">
       <g id="s60extras" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -1409,10 +1479,10 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 998.1 0)">
+    <g id="osrndtools" class="package" transform="translate( 1203.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">OS R&amp;D tools</text>
+     <rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000001">OS R&amp;D tools</text>
      <g transform="translate(0 3.2)">
       <g id="stif" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -1440,16 +1510,26 @@
   </g>
  </g>
  <g id="mw" transform="translate(3.1999999999999993 178.06)" class="layer">
-  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
-  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">Middleware</text>
-  <g class="layer-detail" transform="translate(25.55 3.2)">
-   <rect x="-12.75" class="layer" y="-3.2" width="1077.6" height="231.26000000000002"/>
+  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
+  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
+  <g class="layer-detail" transform="translate(15.499999999999705 3.2)">
+   <rect x="-2.6999999999997044" class="layer" y="-3.2" width="1343.0999999999997" height="222.8"/>
    <g>
-    <g id="appsupport" class="package" transform="translate( 0 104.63000000000001)">
+    <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23">Generic App Support</text>
+     <rect class="package" x="0" width="86.4" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="53.10000000000001" x="59.85" y="48.6" dy="0.375em">Generic App Support</text>
      <g transform="translate(0 3.2)">
+      <g id="appsupport_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic App Support Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="appsupport_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic App Support Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="contextframework" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Context Frame­work</text>
@@ -1460,7 +1540,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Core App UIs</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="flashliteapi_3_1" transform="translate(0 0)" class="collection">
+      <g id="flashliteapi_3_1" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Flash Lite API 3.1</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1510,7 +1590,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Handling</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="openenvutils" transform="translate(17.7 0)" class="collection">
+      <g id="openenvutils" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Env. Utilities</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1535,18 +1615,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Time Zone PC Side</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="appsupport_info" transform="translate(35.4 0)" class="collection">
+      <g id="appsupport_info" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic App Support Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="securitysrv" class="package" transform="translate( 70.8 104.63000000000001)">
+    <g id="securitysrv" class="package" transform="translate( 88.5 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="119.23">Security Services</text>
+     <rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000003">Security Services</text>
      <g transform="translate(0 3.2)">
+      <g id="secsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Security Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="cms" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Certificate Management Service</text>
@@ -1567,7 +1652,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Lock</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="securitydialogs" transform="translate(0 0)" class="collection">
+      <g id="securitydialogs" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Security Dialogs</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1587,18 +1672,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Device Encryption Disk Utils</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="securitysrv_info" transform="translate(17.7 0)" class="collection">
+      <g id="securitysrv_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Security Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="drm" class="package" transform="translate( 123.9 104.63000000000001)">
+    <g id="drm" class="package" transform="translate( 141.6 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">DRM</text>
+     <rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000003">DRM</text>
      <g transform="translate(0 3.2)">
+      <g id="drm_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DRM Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="drm_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DRM Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="commondrm" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Common DRM</text>
@@ -1614,7 +1709,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Windows Media DRM</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="drm_info" transform="translate(0 0)" class="collection">
+      <g id="drm_info" transform="translate(35.4 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DRM Info</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1623,9 +1718,19 @@
     </g>
     <g id="locationsrv" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Location Services</text>
+     <rect class="package" x="0" width="51" height="97.2" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">Location Services</text>
      <g transform="translate(0 3.2)">
+      <g id="locsrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="locsrv_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="genericpositioningplugins" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Generic Positioning Plugins</text>
@@ -1641,7 +1746,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Map &amp; Nav Fmwk.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationsystemui" transform="translate(0 0)" class="collection">
+      <g id="locationsystemui" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location System UI</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1656,19 +1761,19 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Trigger­ing</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationsrv_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Services Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="accesssec" class="package" transform="translate( 153.9 104.63000000000001)">
+    <g id="accesssec" class="package" transform="translate( 194.7 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">Access Security</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">Access Security</text>
      <g transform="translate(0 3.2)">
-      <g id="wlansecuritysettings" transform="translate(0 0)" class="collection">
+      <g id="accesssec_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Access Security Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="wlansecuritysettings" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Security Settings</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1678,18 +1783,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">EAPOL</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="accesssec_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Access Security Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="ipconnmgmt" class="package" transform="translate( 189.3 104.63000000000001)">
+    <g id="ipconnmgmt" class="package" transform="translate( 230.1 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="119.23">IP Connect­ivity Mgmt.</text>
+     <rect class="package" x="0" width="86.4" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="86.4" x="43.2" y="115.00000000000003">IP Connect­ivity Mgmt.</text>
      <g transform="translate(0 3.2)">
+      <g id="ipcm_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Connect­ivity Mgmt. Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="ipcm_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Connect­ivity Mgmt. Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="accesspointcontrol" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Access Point Control</text>
@@ -1720,28 +1830,33 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Connec­tion Monitor­ing</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="connectionutilities" transform="translate(0 0)" class="collection">
+      <g id="connectionutilities" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Connec­tion Utilities</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="dbcreator" transform="translate(17.7 0)" class="collection">
+      <g id="dbcreator" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DB Creator</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="ipconnmgmt_info" transform="translate(35.4 0)" class="collection">
+      <g id="ipconnmgmt_info" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Connect­ivity Mgmt. Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="netprotocols" class="package" transform="translate( 242.4 104.63000000000001)">
+    <g id="netprotocols" class="package" transform="translate( 318.6 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">High-level Internet Protocols</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">High-level Internet Protocols</text>
      <g transform="translate(0 3.2)">
+      <g id="netprotocols_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">High-level Internet Protocols Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="httpfilters" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">HTTP Filters</text>
@@ -1757,18 +1872,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Layer Plugins &amp; Utils</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="netprotocols_info" transform="translate(0 0)" class="collection">
+      <g id="netprotocols_info" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">High-level Internet Protocols Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="ipappprotocols" class="package" transform="translate( 272.40000000000003 104.63000000000001)">
+    <g id="ipappprotocols" class="package" transform="translate( 354 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">IP App Protocols</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">IP App Protocols</text>
      <g transform="translate(0 3.2)">
+      <g id="ipappprotocols_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP App Protocols Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="rtp" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">RTP</text>
@@ -1789,18 +1909,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIP Provider Plugins</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="ipappprotocols_info" transform="translate(0 0)" class="collection">
+      <g id="ipappprotocols_info" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP App Protocols Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="wirelessacc" class="package" transform="translate( 35.4 0)">
+    <g id="wirelessacc" class="package" transform="translate( 53.1 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Wireless Access</text>
+     <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Wireless Access</text>
      <g transform="translate(0 3.2)">
+      <g id="hsfw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">HotSpot FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="hotspotfw" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">HotSpot Frame­work</text>
@@ -1811,19 +1936,19 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">WLAN Utilities</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="wirelessacc_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Wireless Access Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="vpnclient" class="package" transform="translate( 65.39999999999999 0)">
+    <g id="vpnclient" class="package" transform="translate( 83.1 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">VPN Client</text>
+     <rect class="package" x="0" width="51" height="97.2" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">VPN Client</text>
      <g transform="translate(0 3.2)">
-      <g id="vpnapiimpl" transform="translate(0 0)" class="collection">
+      <g id="vpnc_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VPN Client Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="vpnapiimpl" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VPN API Impl.</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1838,18 +1963,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VPN UI</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="vpnclient_info" transform="translate(17.7 0)" class="collection">
+      <g id="vpnclient_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VPN Client Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="ipappsrv" class="package" transform="translate( 100.79999999999998 0)">
+    <g id="ipappsrv" class="package" transform="translate( 136.2 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="48.6" dy="0.375em">IP App Services</text>
+     <rect class="package" x="0" width="51" height="97.2" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="48.6" dy="0.375em">IP App Services</text>
      <g transform="translate(0 3.2)">
+      <g id="ipappsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP App Services Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="natfw" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">NAT Frame­work</text>
@@ -1865,23 +1995,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multi­media Comms Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="natplugins" transform="translate(0 0)" class="collection">
+      <g id="natplugins" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">NAT Plugins</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="ipappsrv_info" transform="translate(17.7 0)" class="collection">
+      <g id="ipappsrv_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP App Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="phonesrv" class="package" transform="translate( 136.2 0)">
+    <g id="phonesrv" class="package" transform="translate( 189.29999999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="51" height="101.43" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="35.4" x="33.3" y="67.4" dy="0.375em">Telephony &amp; SIM Services</text>
+     <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="53.1" x="42.15" y="67.4" dy="0.375em">Telephony &amp; SIM Services</text>
      <g transform="translate(0 3.2)">
+      <g id="phonesrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony &amp; SIM Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="telutils" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony Utils</text>
@@ -1902,7 +2037,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Con­verged Call Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="engines" transform="translate(0 0)" class="collection">
+      <g id="engines" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony Engines</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1922,7 +2057,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIM Application Toolkit Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="satui" transform="translate(17.7 0)" class="collection">
+      <g id="satui" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIM App Toolkit UI</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -1932,18 +2067,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone Command Handler</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="phonesrv_info" transform="translate(35.4 0)" class="collection">
+      <g id="phonesrv_info" transform="translate(53.099999999999994 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony &amp; SIM Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="messagingmw" class="package" transform="translate( 189.29999999999998 0)">
+    <g id="messagingmw" class="package" transform="translate( 260.1 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Messag­ing Middle­ware</text>
+     <rect class="package" x="0" width="51" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">Messag­ing Middle­ware</text>
      <g transform="translate(0 3.2)">
+      <g id="msgfw_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Middle­ware Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="msgfw_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Middle­ware Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="msgbranched" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Messag­ing Branched</text>
@@ -1954,18 +2099,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Messag­ing Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="messagingmw_info" transform="translate(0 0)" class="collection">
+      <g id="messagingmw_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Middle­ware Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="imsrv" class="package" transform="translate( 224.7 0)">
+    <g id="imsrv" class="package" transform="translate( 313.20000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Instant Msg. &amp; Presence Services</text>
+     <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Instant Msg. &amp; Presence Services</text>
      <g transform="translate(0 3.2)">
+      <g id="imsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Instant Msg. &amp; Presence Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="ximpfw" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XIMP Frame­work</text>
@@ -1976,29 +2126,29 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IM Services</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="brandingserver" transform="translate(0 0)" class="collection">
+      <g id="brandingserver" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Branding Server</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imsrv_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Instant Msg. &amp; Presence Services Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="legacypresence" class="package" transform="translate( 260.1 0)">
+    <g id="legacypresence" class="package" transform="translate( 348.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.43">Legacy Presence Services</text>
+     <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">Legacy Presence Services</text>
      <g transform="translate(0 3.2)">
+      <g id="pressrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Legacy Presence Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="xdmengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XDM Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="xdmsettingsui" transform="translate(0 0)" class="collection">
+      <g id="xdmsettingsui" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XDM Settings UI</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2013,7 +2163,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Conn. Manager</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="presencesettingsui" transform="translate(17.7 0)" class="collection">
+      <g id="presencesettingsui" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Presence Settings UI</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2033,18 +2183,18 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIMPLE Data Model Adapter</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="legacypresence_info" transform="translate(35.4 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Legacy Presence Services Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="opensrv" class="package" transform="translate( 330.90000000000003 0)">
+    <g id="opensrv" class="package" transform="translate( 419.40000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Open Services</text>
+     <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Open Services</text>
      <g transform="translate(0 3.2)">
+      <g id="opensrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="loudmouth" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Loud­mouth</text>
@@ -2055,7 +2205,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telepathy Library</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="telepathygabble" transform="translate(0 0)" class="collection">
+      <g id="telepathygabble" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telepathy Gabble</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2065,18 +2215,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Isolation Server</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="opensrv_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Services Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="remotemgmt" class="package" transform="translate( 366.3 0)">
+    <g id="remotemgmt" class="package" transform="translate( 454.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
-     <rect class="package" x="0" width="51" height="101.43" y="0" style="fill:darkseagreen;"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="100.43">Remote Manage­ment</text>
+     <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkseagreen;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="86.2" dy="0.375em">Remote Manage­ment</text>
      <g transform="translate(0 3.2)">
+      <g id="remotemgmt_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Mgmt. Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="remotemgmt_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Mgmt. Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="policymanagement" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Policy Manage­ment</text>
@@ -2087,12 +2242,12 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SyncML Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="terminalsecurity" transform="translate(0 0)" class="collection">
+      <g id="terminalsecurity" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Terminal Security</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="omaprovisioning" transform="translate(17.7 0)" class="collection">
+      <g id="omaprovisioning" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">OMA Provision­ing</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2112,34 +2267,29 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">FOTA App</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="remotemgmt_info" transform="translate(35.4 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Mgmt. Info</text>
+     </g>
+    </g>
+    <g id="remotestorage" class="package" transform="translate( 389.4 100.4)">
+     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
+     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Remote Storage</text>
+     <g transform="translate(0 3.2)">
+      <g id="rsfw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Storage Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="remotestoragefw" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Storage Fmwk.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="remotestorage" class="package" transform="translate( 307.8 104.63000000000001)">
+    <g id="remoteconn" class="package" transform="translate( 419.4 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Remote Storage</text>
-     <g transform="translate(0 3.2)">
-      <g id="remotestoragefw" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Storage Fmwk.</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="remotestorage_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Storage Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="remoteconn" class="package" transform="translate( 337.8 104.63000000000001)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">Remote Connect­ivity</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">Remote Connect­ivity</text>
      <g transform="translate(0 3.2)">
       <g id="connectivitymodules" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2178,11 +2328,16 @@
       </g>
      </g>
     </g>
-    <g id="srvdiscovery" class="package" transform="translate( 373.2 104.63000000000001)">
+    <g id="srvdiscovery" class="package" transform="translate( 454.79999999999995 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Service Discovery &amp; Usage</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">Service Discovery &amp; Usage</text>
      <g transform="translate(0 3.2)">
+      <g id="upnpstack_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP Stack Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="servicediscoveryandcontrol" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service Discovery &amp; Control</text>
@@ -2193,19 +2348,24 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="srvdiscovery_info" transform="translate(0 0)" class="collection">
+      <g id="srvdiscovery_info" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service Discovery &amp; Usage Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="dlnasrv" class="package" transform="translate( 419.40000000000003 0)">
+    <g id="dlnasrv" class="package" transform="translate( 525.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="101.43" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.43">DLNA Services</text>
+     <rect class="package" x="0" width="86.4" height="97.2" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="86.4" x="43.2" y="86.2" dy="0.375em">DLNA Services</text>
      <g transform="translate(0 3.2)">
-      <g id="upnpavcontrolpoint" transform="translate(0 0)" class="collection">
+      <g id="dlnasrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DLNA Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="upnpavcontrolpoint" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP A/V Control Point</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2235,7 +2395,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP Sharing</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="upnpmpxplugins" transform="translate(17.7 0)" class="collection">
+      <g id="upnpmpxplugins" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP MPX Plugins</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2245,7 +2405,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UPnP Harvester</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="homesync" transform="translate(35.4 0)" class="collection">
+      <g id="homesync" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Sync</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2255,41 +2415,56 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Media</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="dlnasrv_info" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="dlnasrv_info" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">DLNA Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="btservices" class="package" transform="translate( 403.2 104.63000000000001)">
+    <g id="btservices" class="package" transform="translate( 490.19999999999993 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">Blue­tooth Services</text>
+     <rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="115.00000000000003">Blue­tooth Services</text>
      <g transform="translate(0 3.2)">
+      <g id="btservices_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">BT Services Public Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="btservices_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">BT Services Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="bluetoothengine" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Blue­tooth Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="bluetoothappprofiles" transform="translate(0 0)" class="collection">
+      <g id="bluetoothappprofiles" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Btooth. App Profiles</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="btservices_info" transform="translate(17.7 0)" class="collection">
+      <g id="btservices_info" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">BT Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="usbservices" class="package" transform="translate( 438.59999999999997 104.63000000000001)">
+    <g id="usbservices" class="package" transform="translate( 560.9999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">USB Services</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">USB Services</text>
      <g transform="translate(0 3.2)">
-      <g id="usbservices_info" transform="translate(0 0)" class="collection">
+      <g id="usbservices_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Services Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="usbservices_info" transform="translate(17.7 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">USB Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2311,28 +2486,33 @@
       </g>
      </g>
     </g>
-    <g id="shortlinkconn" class="package" transform="translate( 468.59999999999997 104.63000000000001)">
+    <g id="shortlinkconn" class="package" transform="translate( 596.3999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Shortlink Connectivity</text>
+     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Shortlink Connectivity</text>
      <g transform="translate(0 3.2)">
+      <g id="shortlinkconn_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Shortlink Connectivity Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="localconnectivityservice" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Local Connectivity Service</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="shortlinkconn_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Shortlink Connectivity Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="imghandling" class="package" transform="translate( 490.20000000000005 0)">
+    <g id="imghandling" class="package" transform="translate( 614.1 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Image Handling</text>
+     <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Image Handling</text>
      <g transform="translate(0 3.2)">
+      <g id="imagehandling_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Handling Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="imagehandlinglib" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Handling Library</text>
@@ -2343,35 +2523,45 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Handling Utilities</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imghandling_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Handling Info</text>
+     </g>
+    </g>
+    <g id="metadatasrv" class="package" transform="translate( 644.1 0)">
+     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
+     <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Legacy Metadata Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="metadatasrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Legacy Metadata Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="metadatasrv_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Legacy Metadata Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="mediamanagementutilities" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Media Mgmt. Utilities</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="metadatasrv" class="package" transform="translate( 520.2 0)">
+    <g id="mds" class="package" transform="translate( 679.5 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Legacy Metadata Services</text>
+     <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">Metadata Services</text>
      <g transform="translate(0 3.2)">
-      <g id="mediamanagementutilities" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Media Mgmt. Utilities</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="metadatasrv_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Legacy Metadata Services Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="mds" class="package" transform="translate( 550.2 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="51" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="100.43">Metadata Services</text>
-     <g transform="translate(0 3.2)">
+      <g id="mds_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Metadata Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="mds_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Metadata Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="metadataengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Metadata Engine</text>
@@ -2397,60 +2587,70 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Watchdog</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="clfwrapper" transform="translate(0 0)" class="collection">
+      <g id="clfwrapper" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Listing FW Wrapper</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mds_info" transform="translate(17.7 0)" class="collection">
+      <g id="mds_info" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Metadata Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="mmuifw" class="package" transform="translate( 603.3000000000001 0)">
+    <g id="mmuifw" class="package" transform="translate( 750.3 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="51" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="100.43">Multi­media UI Fmwk.</text>
+     <rect class="package" x="0" width="51" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="86.2" dy="0.375em">Multi­media UI Fmwk.</text>
      <g transform="translate(0 3.2)">
-      <g id="mmuifw_info" transform="translate(0 0)" class="collection">
+      <g id="mmuifw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM UI FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="mmuifw_info" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multi­media UI Fmwk. Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="osncore" transform="translate(0 18.8)" class="collection">
+      <g id="osncore" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">OS Neutral Library Core</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="alfwidgetutils" transform="translate(17.7 0)" class="collection">
+      <g id="alfwidgetutils" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Accelerated LAF Widget Utils</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="resourcepool" transform="translate(17.7 18.8)" class="collection">
+      <g id="resourcepool" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Resource Pool</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="widgetmodel" transform="translate(0 37.6)" class="collection">
+      <g id="widgetmodel" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Widget Model</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mulwidgets" transform="translate(35.4 0)" class="collection">
+      <g id="mulwidgets" transform="translate(35.4 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MUL Widgets</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="videoutils" class="package" transform="translate( 656.4000000000001 0)">
+    <g id="videoutils" class="package" transform="translate( 803.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Video Utils</text>
+     <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Video Utils</text>
      <g transform="translate(0 3.2)">
+      <g id="videoutils_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Utils Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="videoscheduler" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Sched­uler</text>
@@ -2461,18 +2661,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Conn. Utility</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="videoutils_info" transform="translate(0 0)" class="collection">
+      <g id="videoutils_info" transform="translate(17.7 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Utils Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="mmmw" class="package" transform="translate( 498.59999999999997 104.63000000000001)">
+    <g id="mmmw" class="package" transform="translate( 626.3999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">Multi­media Middle­ware</text>
+     <rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000003">Multi­media Middle­ware</text>
      <g transform="translate(0 3.2)">
+      <g id="mmmw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Middle­ware Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="mmfenh" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MMF Enhancements</text>
@@ -2483,22 +2688,22 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia Frameworks</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mmserv" transform="translate(0 0)" class="collection">
+      <g id="mmserv" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multimedia Services</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mmmw_info" transform="translate(17.7 0)" class="collection">
+      <g id="mmmw_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Middle­ware Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="helix" class="package" transform="translate( 534 104.63000000000001)">
+    <g id="helix" class="package" transform="translate( 679.4999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Helix</text>
+     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Helix</text>
      <g transform="translate(0 3.2)">
       <g id="helix_ren" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2507,11 +2712,16 @@
       </g>
      </g>
     </g>
-    <g id="camerasrv" class="package" transform="translate( 691.8000000000001 0)">
+    <g id="camerasrv" class="package" transform="translate( 838.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Camera Services</text>
+     <rect class="package" x="0" width="51" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">Camera Services</text>
      <g transform="translate(0 3.2)">
+      <g id="camerasrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="camappengine" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera App Engine</text>
@@ -2522,23 +2732,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Cam­corder MMF Plugin</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="configmanagers" transform="translate(0 0)" class="collection">
+      <g id="configmanagers" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Config Managers</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="camerasrv_info" transform="translate(17.7 0)" class="collection">
+      <g id="camerasrv_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="mmappfw" class="package" transform="translate( 727.2 0)">
+    <g id="mmappfw" class="package" transform="translate( 891.9 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Multi­media App Fmwk.</text>
+     <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Multi­media App Fmwk.</text>
      <g transform="translate(0 3.2)">
+      <g id="mmappfw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM App FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="mpx" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multi­media Player</text>
@@ -2549,46 +2764,66 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multi­media App Cmp.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mmappfw_info" transform="translate(0 0)" class="collection">
+      <g id="mmappfw_info" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM App FW Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="inputmethods" class="package" transform="translate( 564 104.63000000000001)">
+    <g id="inputmethods" class="package" transform="translate( 709.4999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="119.23">Input Methods</text>
+     <rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000003">Input Methods</text>
      <g transform="translate(0 3.2)">
-      <g id="textinput" transform="translate(0 0)" class="collection">
+      <g id="inputmethods_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Input Methods Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="inputmethods_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Input Methods Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="textinput" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Text Input</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="fep" transform="translate(0 18.8)" class="collection">
+      <g id="fep" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">FEP</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="inputmethods_info" transform="translate(17.7 0)" class="collection">
+      <g id="inputmethods_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Input Methods Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="qt" class="package placeholder" transform="translate( 599.4 104.63000000000001)">
+    <g id="qt" class="package placeholder" transform="translate( 762.5999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="78" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="59.114999999999995" dy="0.375em" height="15.600000000000001">Qt</text>
+     <rect class="package" x="0" width="78" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="15.600000000000001">Qt</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="classicui" class="package" transform="translate( 679.5 104.63000000000001)">
+    <g id="classicui" class="package" transform="translate( 842.6999999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23">Classic UI</text>
+     <rect class="package" x="0" width="104.1" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="104.1" x="52.05" y="115.00000000000003">Classic UI</text>
      <g transform="translate(0 3.2)">
+      <g id="classicui_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Classic UI Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="classicui_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Classic UI Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="ode" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Dynamics Engine</text>
@@ -2599,7 +2834,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="commonuis" transform="translate(0 0)" class="collection">
+      <g id="commonuis" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Common UIs</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2609,7 +2844,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Inter­working Fmwk.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="psln" transform="translate(17.7 0)" class="collection">
+      <g id="psln" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Personal­ization</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2624,7 +2859,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Avkon Touch Gesture Framework</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="uiutils" transform="translate(35.4 0)" class="collection">
+      <g id="uiutils" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Utils</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2639,21 +2874,21 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Look-and-Feel Agnostic UI Found­ation</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="classicui_info" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="classicui_info" transform="translate(88.5 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Classic UI Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="svgt" class="package" transform="translate( 750.3 104.63000000000001)">
+    <g id="svgt" class="package" transform="translate( 948.9 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">SVG Tiny</text>
+     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">SVG Tiny</text>
      <g transform="translate(0 3.2)">
-      <g id="svgt_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SVG Tiny Info</text>
+      <g id="svgt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SVG Tiny Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
       <g id="svgtopt" transform="translate(0 18.8)" class="collection">
@@ -2663,14 +2898,14 @@
       </g>
      </g>
     </g>
-    <g id="uiaccelerator" class="package" transform="translate( 780.3 104.63000000000001)">
+    <g id="uiaccelerator" class="package" transform="translate( 978.9 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">UI Accel­erator</text>
+     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">UI Accel­erator</text>
      <g transform="translate(0 3.2)">
-      <g id="uiaccelerator_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Accel­erator Info</text>
+      <g id="uiaccelerator_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Accel­erator Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
       <g id="uiacceltk" transform="translate(0 56.400000000000006)" class="collection">
@@ -2680,12 +2915,22 @@
       </g>
      </g>
     </g>
-    <g id="uiresources" class="package" transform="translate( 810.3 104.63000000000001)">
+    <g id="uiresources" class="package" transform="translate( 1008.9 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="119.23">UI Resources</text>
+     <rect class="package" x="0" width="104.1" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="104.1" x="52.05" y="105" dy="0.375em">UI Resources</text>
      <g transform="translate(0 3.2)">
-      <g id="uiresources_info" transform="translate(0 0)" class="collection">
+      <g id="uiresources_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Resources Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="uiresources_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Resources Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="uiresources_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Resources Info</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2700,12 +2945,12 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Layouts</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="skins" transform="translate(17.7 0)" class="collection">
+      <g id="skins" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Skins</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="pictographs" transform="translate(35.4 0)" class="collection">
+      <g id="pictographs" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Picto­graphs</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2725,18 +2970,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Font Support</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="helpthemes" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="helpthemes" transform="translate(88.5 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Help Themes</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="hapticsservices" class="package" transform="translate( 881.0999999999999 104.63000000000001)">
+    <g id="hapticsservices" class="package" transform="translate( 1115.1 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Haptics Services</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">Haptics Services</text>
      <g transform="translate(0 3.2)">
+      <g id="hapticsservices_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Haptics Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="hapticsservices_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Haptics Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="tacticonserver" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Tacticon Server</text>
@@ -2747,18 +3002,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Tactile Feedback</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="hapticsservices_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Haptics Services Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="gsprofilesrv" class="package" transform="translate( 911.0999999999999 104.63000000000001)">
+    <g id="gsprofilesrv" class="package" transform="translate( 1150.5 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">General Settings &amp; Profiles Services</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">General Settings &amp; Profiles Services</text>
      <g transform="translate(0 3.2)">
+      <g id="gsprofilesrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">GS &amp; Profiles Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="gsprofilesrv_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">GS &amp; Profiles Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="gssettingsuis" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">General Settings UIs</text>
@@ -2769,18 +3029,18 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Profiles Services</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="gsprofilesrv_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">GS &amp; Profiles Services Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="homescreensrv" class="package" transform="translate( 757.2 0)">
+    <g id="homescreensrv" class="package" transform="translate( 927.3 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="51" height="101.43" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="100.43">Home Screen Services</text>
+     <rect class="package" x="0" width="51" height="97.2" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="35.4" x="33.3" y="86.2" dy="0.375em">Home Screen Services</text>
      <g transform="translate(0 3.2)">
+      <g id="homescreensrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Screen Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="xcfw" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML Content Frame­work</text>
@@ -2821,18 +3081,23 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Control Service</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="homescreensrv_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Screen Services Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="appinstall" class="package" transform="translate( 941.0999999999999 104.63000000000001)">
+    <g id="appinstall" class="package" transform="translate( 1185.9 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="119.23">App Install­ation</text>
+     <rect class="package" x="0" width="86.4" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="86.4" x="43.2" y="115.00000000000003">App Install­ation</text>
      <g transform="translate(0 3.2)">
+      <g id="appinstall_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Install­ation Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="appinstall_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Install­ation Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="ncdengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Nokia Content Discover</text>
@@ -2843,12 +3108,12 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Installer</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="iaupdateapi_stub" transform="translate(0 0)" class="collection">
+      <g id="iaupdateapi_stub" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IA Update API Stub</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="iaupdate" transform="translate(17.7 0)" class="collection">
+      <g id="iaupdate" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Independent Apps Update</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2863,18 +3128,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Secure SW Install Tools</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="appinstall_info" transform="translate(35.4 0)" class="collection">
+      <g id="appinstall_info" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">App Install­ation Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="serviceapifw" class="package" transform="translate( 810.3000000000001 0)">
+    <g id="serviceapifw" class="package" transform="translate( 980.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Service API Frame­work</text>
+     <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Service API Frame­work</text>
      <g transform="translate(0 3.2)">
+      <g id="serviceapifw_pub" transform="translate(0 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service API FW Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="serviceapifw_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service API FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="rtsecuritymanager" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Runtime Security Manager</text>
@@ -2885,17 +3160,12 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Language Inter­working FW</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="serviceapifw_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service API Fmwk. Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="serviceapi" class="package" transform="translate( 840.3000000000001 0)">
+    <g id="serviceapi" class="package" transform="translate( 1015.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Service API</text>
+     <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Service API</text>
      <g transform="translate(0 3.2)">
       <g id="serviceproviders" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2904,12 +3174,22 @@
       </g>
      </g>
     </g>
-    <g id="web" class="package" transform="translate( 870.3000000000001 0)">
+    <g id="web" class="package" transform="translate( 1045.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Web</text>
+     <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="86.2" dy="0.375em">Web</text>
      <g transform="translate(0 3.2)">
-      <g id="web_info" transform="translate(0 0)" class="collection">
+      <g id="web_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="web_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="web_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Info</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2924,7 +3204,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="codhandler" transform="translate(17.7 0)" class="collection">
+      <g id="codhandler" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Object Descriptor Handler</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -2936,27 +3216,32 @@
       </g>
      </g>
     </g>
-    <g id="websrv" class="package" transform="translate( 994.1999999999999 104.63000000000001)">
+    <g id="websrv" class="package" transform="translate( 1274.4 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Web Services</text>
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="115.00000000000003">Web Services</text>
      <g transform="translate(0 3.2)">
+      <g id="websrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="webservices" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Services Fmwk.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="websrv_info" transform="translate(0 0)" class="collection">
+      <g id="websrv_info" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Services Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="platformtools" class="package" transform="translate( 1024.1999999999998 104.63000000000001)">
+    <g id="platformtools" class="package" transform="translate( 1309.8000000000002 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23">Platform Tools</text>
+     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Platform Tools</text>
      <g transform="translate(0 3.2)">
       <g id="gfxconversion" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2965,11 +3250,21 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 905.7 0)">
+    <g id="uitools" class="package" transform="translate( 1116.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="101.43" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="100.43">UI Tools</text>
+     <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
      <g transform="translate(0 3.2)">
+      <g id="uitools_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Tools Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="uitools_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Tools Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="cdlcompilertoolkit" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">CDL Compiler Toolkit</text>
@@ -3010,11 +3305,6 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SVGT Encoder</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="uitools_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Tools Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
    </g>
@@ -3024,13 +3314,23 @@
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="174.86"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="174.86" height="9.3" x="-87.73">Applications</text>
   <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="1077.6" height="174.86"/>
+   <rect x="0" class="layer" y="-3.2" width="1343.0999999999997" height="174.86"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="81.63000000000001">Location Apps</text>
+     <rect class="package" x="0" width="104.1" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="104.1" x="52.05" y="81.63000000000001">Location Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="loc_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Apps Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="loc_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Apps Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="basiclocationinfodisplay" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Basic Location Info Display</text>
@@ -3046,17 +3346,17 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Events UI</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationlandmarksrefappfors60" transform="translate(0 0)" class="collection">
+      <g id="locationlandmarksrefappfors60" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Land­marks Ref App for S60</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationlandmarksuirefapp" transform="translate(17.7 0)" class="collection">
+      <g id="locationlandmarksuirefapp" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Land­marks UI Ref App</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationsatviewrefapp" transform="translate(35.4 0)" class="collection">
+      <g id="locationsatviewrefapp" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Satellite View Ref App</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3066,7 +3366,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Simula­tion PSY Config­urator</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mapnavproviderrefapp" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="mapnavproviderrefapp" transform="translate(88.5 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Map &amp; Nav Provider Ref App</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3076,18 +3376,18 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Centre</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="location_info" transform="translate(35.4 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Apps Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
     <g id="mmsharinguis" class="package" transform="translate( 0 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Multi­media Sharing UIs</text>
+     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Multi­media Sharing UIs</text>
      <g transform="translate(0 3.2)">
+      <g id="mmsharinguis_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Sharing UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="mmsharing" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multi­media Sharing</text>
@@ -3098,19 +3398,24 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Sharing Plugins</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mmsharinguis_info" transform="translate(0 0)" class="collection">
+      <g id="mmsharinguis_info" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Sharing UIs Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="phone" class="package" transform="translate( 70.8 0)">
+    <g id="phone" class="package" transform="translate( 106.19999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="33.3" height="168.46" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="167.46">Phone Apps</text>
      <g transform="translate(0 3.2)">
-      <g id="phoneapp" transform="translate(0 0)" class="collection">
+      <g id="phone_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="phoneapp" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone App</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3130,11 +3435,6 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone UIs</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="phone_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone Apps Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
       <g id="phoneplugins" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone Plugins</text>
@@ -3142,17 +3442,22 @@
       </g>
      </g>
     </g>
-    <g id="videotelephony" class="package" transform="translate( 106.19999999999999 0)">
+    <g id="videotelephony" class="package" transform="translate( 141.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Telephony Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="videotelephony_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VT Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="vtengines" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Telephony Engines</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="vtuis" transform="translate(0 0)" class="collection">
+      <g id="vtuis" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Telephony UIs</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3167,19 +3472,19 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VT Protocols Stub</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="videotelephony_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VT Apps Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="iptelephony" class="package" transform="translate( 141.6 0)">
+    <g id="iptelephony" class="package" transform="translate( 177 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">IP Telephony</text>
      <g transform="translate(0 3.2)">
-      <g id="iptelcommsconfig" transform="translate(0 0)" class="collection">
+      <g id="iptel_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Telephony Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="iptelcommsconfig" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Telephony Comms Config</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3209,58 +3514,53 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Call Continuity</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="iptelephony_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IP Telephony Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="settingsuis" class="package" transform="translate( 106.19999999999999 85.83000000000001)">
+    <g id="settingsuis" class="package" transform="translate( 141.6 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Settings UIs</text>
      <g transform="translate(0 3.2)">
+      <g id="devmngt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Settings UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="defaultapplicationsettings" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Default App Settings</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="systemswuis" transform="translate(0 0)" class="collection">
+      <g id="systemswuis" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">System SW UIs</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="settingsuis_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Settings UIs Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="contentcontrol" class="package" transform="translate( 141.6 85.83000000000001)">
+    <g id="contentcontrol" class="package" transform="translate( 177 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Content Control Daemons</text>
      <g transform="translate(0 3.2)">
+      <g id="contentctrl_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Control Daemons Platforn Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="dsdcmoadapter" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Data Sync DCMO Adapter</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="omads" transform="translate(0 0)" class="collection">
+      <g id="omads" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">OMA Data Sync</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="contentcontrol_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Content Control Daemons Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="devicecontrol" class="package" transform="translate( 177 85.83000000000001)">
+    <g id="devicecontrol" class="package" transform="translate( 212.4 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Dev­ice Control Daemons</text>
@@ -3297,7 +3597,7 @@
       </g>
      </g>
     </g>
-    <g id="printing" class="package" transform="translate( 212.4 85.83000000000001)">
+    <g id="printing" class="package" transform="translate( 247.8 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Printing</text>
@@ -3309,17 +3609,22 @@
       </g>
      </g>
     </g>
-    <g id="files" class="package" transform="translate( 177 0)">
+    <g id="files" class="package" transform="translate( 212.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">File Manager Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="files_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File Manager Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="deviceencryption" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Device Encryption</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="filemanager" transform="translate(0 0)" class="collection">
+      <g id="filemanager" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File Manager</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3329,14 +3634,9 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File System UIs</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="files_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File Manager Apps Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="utils" class="package" transform="translate( 212.4 0)">
+    <g id="utils" class="package" transform="translate( 247.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Utility Apps</text>
@@ -3348,22 +3648,32 @@
       </g>
      </g>
     </g>
-    <g id="contacts" class="package" transform="translate( 242.4 0)">
+    <g id="contacts" class="package" transform="translate( 277.80000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="51" height="168.46" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="167.46">Contacts Apps</text>
+     <rect class="package" x="0" width="86.4" height="168.46" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="86.4" x="43.2" y="167.46">Contacts Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="contacts_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Contacts Apps Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="contacts_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Contacts Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="contactextensions" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Contacts Exten­sions</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="logsui" transform="translate(0 0)" class="collection">
+      <g id="logsui" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Logs UI</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="phonebookui" transform="translate(17.7 0)" class="collection">
+      <g id="phonebookui" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Phone­book UI</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3393,18 +3703,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Predictive Search</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="contacts_info" transform="translate(35.4 0)" class="collection">
+      <g id="contacts_info" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Contacts Apps Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="organizer" class="package" transform="translate( 295.50000000000006 0)">
+    <g id="organizer" class="package" transform="translate( 366.30000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Organizer App Suite</text>
+     <rect class="package" x="0" width="104.1" height="168.46" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="104.1" x="52.05" y="167.46">Organizer App Suite</text>
      <g transform="translate(0 3.2)">
+      <g id="organizer_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Organizer App Suite Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="organizer_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Organizer App Suite Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="alarmengines" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Alarm Engines</text>
@@ -3425,7 +3745,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Search Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="alarmui" transform="translate(0 0)" class="collection">
+      <g id="alarmui" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Alarm UI</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3440,7 +3760,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Meeting UI</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="clock2" transform="translate(17.7 0)" class="collection">
+      <g id="clock2" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Clock</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3450,7 +3770,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Notepad</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="searchui" transform="translate(35.4 0)" class="collection">
+      <g id="searchui" transform="translate(70.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Search UI</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3465,19 +3785,29 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">PIM App Support</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="organizer_info" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="organizer_info" transform="translate(88.5 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Organizer App Suite Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="messaging" class="package" transform="translate( 366.30000000000007 0)">
+    <g id="messaging" class="package" transform="translate( 472.50000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="168.46" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="167.46">Messag­ing Apps</text>
+     <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Messag­ing Apps</text>
      <g transform="translate(0 3.2)">
-      <g id="mobilemessaging" transform="translate(0 0)" class="collection">
+      <g id="msg_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Apps Public APIs</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="msg_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Apps Platform APIs</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="mobilemessaging" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Mobile Messag­ing</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3497,18 +3827,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="messaging_info" transform="translate(17.7 0)" class="collection">
+      <g id="messaging_info" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Messag­ing Apps Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="commonemail" class="package" transform="translate( 401.70000000000005 0)">
+    <g id="commonemail" class="package" transform="translate( 543.3000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="168.46" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="167.46">Email Apps</text>
+     <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Email Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="email_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Apps Public Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="email_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="emailservices" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Services</text>
@@ -3529,23 +3869,28 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Meeting Request</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="emailuis" transform="translate(0 0)" class="collection">
+      <g id="emailuis" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email UIs</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="commonemail_info" transform="translate(17.7 0)" class="collection">
+      <g id="commonemail_info" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Email Apps Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="conversations" class="package" transform="translate( 437.1 0)">
+    <g id="conversations" class="package" transform="translate( 614.1 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Conversa­tion Apps</text>
+     <rect class="package" x="0" width="68.7" height="82.63000000000001" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="81.63000000000001">Conversa­tion Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="conversations_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Conversa­tion Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="uiservicetabsettings" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Service Tab Settings</text>
@@ -3561,12 +3906,12 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IM Service Tab Utils</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="uiservicetab" transform="translate(0 0)" class="collection">
+      <g id="uiservicetab" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Service Tab</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="servicewidget" transform="translate(17.7 0)" class="collection">
+      <g id="servicewidget" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Service Widget</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3581,70 +3926,80 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IM Status Pane Indicator Plugin</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="conversations_info" transform="translate(35.4 0)" class="collection">
+      <g id="conversations_info" transform="translate(53.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Conversa­tion Apps Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="im" class="package" transform="translate( 490.20000000000005 0)">
+    <g id="im" class="package" transform="translate( 684.9 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Instant Msg. Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="im_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Instant Msg. Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="wvsettings20" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Wireless Village Settings Eng.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="im_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Instant Msg. Apps Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="dictionary" class="package" transform="translate( 437.1 85.83000000000001)">
+    <g id="dictionary" class="package" transform="translate( 614.1 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Dictio­nary</text>
      <g transform="translate(0 3.2)">
-      <g id="userdict" transform="translate(0 0)" class="collection">
+      <g id="dictionary_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Dictio­nary Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="userdict" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">User Dictio­nary</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="dictionary_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Dictio­nary Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="camera" class="package" transform="translate( 520.2 0)">
+    <g id="camera" class="package" transform="translate( 714.9 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Camera Apps</text>
+     <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Camera Apps</text>
      <g transform="translate(0 3.2)">
-      <g id="camerauis" transform="translate(0 0)" class="collection">
+      <g id="camera_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="camerauis" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera UIs</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="camera_info" transform="translate(17.7 0)" class="collection">
+      <g id="camera_info" transform="translate(35.4 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Camera Apps Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="imgeditor" class="package" transform="translate( 555.6 0)">
+    <g id="imgeditor" class="package" transform="translate( 768 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Image Editor Apps</text>
      <g transform="translate(0 3.2)">
-      <g id="imageeditor" transform="translate(0 0)" class="collection">
+      <g id="imgeditor_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Editor Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="imageeditor" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Editor UI</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3654,19 +4009,19 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Editor Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imgeditor_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Editor Apps Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="videoeditor" class="package" transform="translate( 591 0)">
+    <g id="videoeditor" class="package" transform="translate( 803.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Editor Apps</text>
      <g transform="translate(0 3.2)">
-      <g id="videditor" transform="translate(0 0)" class="collection">
+      <g id="videoeditor_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="videditor" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3676,18 +4031,18 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="videoeditor_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor Apps Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="videoplayer" class="package" transform="translate( 626.4 0)">
+    <g id="videoplayer" class="package" transform="translate( 838.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="0" x="33.3" y="67.4" dy="0.375em">Video Player Apps</text>
      <g transform="translate(0 3.2)">
+      <g id="videoplayer_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Player Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="videofeeds" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Feeds</text>
@@ -3713,7 +4068,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File Details</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="videoplayerapp" transform="translate(0 0)" class="collection">
+      <g id="videoplayerapp" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Player App</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3723,36 +4078,36 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Playback Plugins</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="videoplayer_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Player Apps Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="photos" class="package" transform="translate( 661.8 0)">
+    <g id="photos" class="package" transform="translate( 874.1999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Photos</text>
      <g transform="translate(0 3.2)">
-      <g id="photosgallery" transform="translate(0 0)" class="collection">
+      <g id="photos_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Photos Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="photosgallery" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Photos Gallery</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="photos_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Photos Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="musicplayer" class="package" transform="translate( 697.1999999999999 0)">
+    <g id="musicplayer" class="package" transform="translate( 909.5999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="48.6" dy="0.375em">Music Player Apps</text>
+     <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Music Player Apps</text>
      <g transform="translate(0 3.2)">
-      <g id="mpxmusicplayer" transform="translate(0 0)" class="collection">
+      <g id="musicplayer_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Music Player Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="mpxmusicplayer" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MPX Music Player</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3767,14 +4122,14 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MPX Plugins</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="musicplayer_info" transform="translate(17.7 0)" class="collection">
+      <g id="musicplayer_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Music Player Apps Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="radio" class="package" transform="translate( 732.5999999999999 0)">
+    <g id="radio" class="package" transform="translate( 962.6999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Radio Apps</text>
@@ -3786,36 +4141,41 @@
       </g>
      </g>
     </g>
-    <g id="internetradio" class="package placeholder" transform="translate( 762.5999999999999 0)">
+    <g id="internetradio" class="package placeholder" transform="translate( 992.6999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="tv" class="package placeholder" transform="translate( 472.5 85.83000000000001)">
+    <g id="tv" class="package placeholder" transform="translate( 649.5 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000026" dy="0.375em" height="15.600000000000001">TV Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="voicerec" class="package" transform="translate( 842.6999999999999 0)">
+    <g id="voicerec" class="package" transform="translate( 1072.7999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Voice Recorder Apps</text>
+     <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Voice Recorder Apps</text>
      <g transform="translate(0 3.2)">
-      <g id="voicerecorder" transform="translate(0 0)" class="collection">
+      <g id="voicerec_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice Recorder Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="voicerecorder" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice Recorder</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="voicerec_info" transform="translate(17.7 0)" class="collection">
+      <g id="voicerec_info" transform="translate(35.4 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice Recorder Apps Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package" transform="translate( 878.0999999999999 0)">
+    <g id="screensaver" class="package" transform="translate( 1125.8999999999996 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -3832,12 +4192,17 @@
       </g>
      </g>
     </g>
-    <g id="homescreen" class="package" transform="translate( 908.0999999999999 0)">
+    <g id="homescreen" class="package" transform="translate( 1155.8999999999996 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Home Screen Apps</text>
      <g transform="translate(0 3.2)">
-      <g id="idlehomescreen" transform="translate(0 0)" class="collection">
+      <g id="homescreen_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Screen Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="idlehomescreen" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Idle Home Screen</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3852,21 +4217,16 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Task Switcher</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="homescreen_info" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Screen Apps Info</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
-    <g id="graphicsuis" class="package" transform="translate( 552.6 85.83000000000001)">
+    <g id="graphicsuis" class="package" transform="translate( 729.6 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Graphics UIs</text>
      <g transform="translate(0 3.2)">
-      <g id="graphicsuis_info" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics UIs Info</text>
+      <g id="graphicsuis_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Graphics UIs Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
       <g id="svgtviewer" transform="translate(17.7 0)" class="collection">
@@ -3876,29 +4236,39 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 943.4999999999999 0)">
+    <g id="profile" class="package" transform="translate( 1191.2999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Profiles</text>
+     <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
      <g transform="translate(0 3.2)">
-      <g id="profilesapplication" transform="translate(0 0)" class="collection">
+      <g id="profile_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Profiles Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="profilesapplication" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Profiles App</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="profile_info" transform="translate(17.7 0)" class="collection">
+      <g id="profile_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Profiles Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 588 85.83000000000001)">
+    <g id="speechsrv" class="package" transform="translate( 765 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Speech Recog­nition UIs</text>
+     <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">Speech Recog­nition UIs</text>
      <g transform="translate(0 3.2)">
-      <g id="voiceui" transform="translate(0 0)" class="collection">
+      <g id="speechsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Speech Recog­nition UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="voiceui" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice UI</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3908,14 +4278,14 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Speech Recog­nition &amp; Synthesis FW</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="speechsrv_info" transform="translate(17.7 0)" class="collection">
+      <g id="speechsrv_info" transform="translate(35.4 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Speech Recog­nition UIs Info</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="homescreentools" class="package" transform="translate( 623.4 85.83000000000001)">
+    <g id="homescreentools" class="package" transform="translate( 818.1 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">Home Screen Tools</text>
@@ -3937,7 +4307,7 @@
       </g>
      </g>
     </g>
-    <g id="webuis" class="package" transform="translate( 676.5 85.83000000000001)">
+    <g id="webuis" class="package" transform="translate( 871.2 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Web UIs</text>
@@ -3959,11 +4329,16 @@
       </g>
      </g>
     </g>
-    <g id="jrt" class="package" transform="translate( 711.9 85.83000000000001)">
+    <g id="jrt" class="package" transform="translate( 906.6 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
      <g transform="translate(0 3.2)">
+      <g id="jrt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">JRT Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="java_stubs" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Java Stubs</text>
@@ -3976,7 +4351,7 @@
       </g>
      </g>
     </g>
-    <g id="conntools" class="package" transform="translate( 741.9 85.83000000000001)">
+    <g id="conntools" class="package" transform="translate( 936.6 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Connect­ivity Tools</text>
@@ -3993,7 +4368,7 @@
       </g>
      </g>
     </g>
-    <g id="rndtools" class="package" transform="translate( 771.9 85.83000000000001)">
+    <g id="rndtools" class="package" transform="translate( 966.6 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">R&amp;D tools</text>
@@ -4045,7 +4420,7 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 978.8999999999999 0)">
+    <g id="helps" class="package" transform="translate( 1244.3999999999996 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="167.46">Help Apps</text>
@@ -4067,7 +4442,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 1008.8999999999999 0)">
+    <g id="techview" class="package" transform="translate( 1274.3999999999996 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Techview</text>
@@ -4162,7 +4537,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(801.0794999999999 650.1800000000003) translate(295.7205 0) scale(2.9671260531481587) translate(-295.7205)">
+ <g id="legend-root" class="legend" transform="translate(1066.5794999999998 637.4900000000001) translate(295.7205 0) scale(3.6853718291427207) translate(-295.7205)">
   <text text-anchor="middle" class="title" x="279.38525000000004" y="0">
    <tspan dy="0.75em" x="279.38525000000004">Symbian OS ^3</tspan>
    <tspan dy="1em" x="279.38525000000004">System Model</tspan>
@@ -4231,7 +4606,7 @@
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="243.275" y="3.0999999999999996">
      <tspan dy="-0.5em" x="243.275">110 Packages</tspan>
-     <tspan dy="1em" x="243.275">588 Collections</tspan>
+     <tspan dy="1em" x="243.275">663 Collections</tspan>
     </text>
    </g>
   </g>
--- a/symbian3/single/sysdefs/sf3lit.svg	Thu Mar 18 11:43:11 2010 +0000
+++ b/symbian3/single/sysdefs/sf3lit.svg	Fri Mar 19 14:46:47 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 2031.5 818.6191222156103" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 4866.799999999999 841.8949607098763" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: %d %b %Y</title>
  <defs>
   <style type="text/css">
@@ -423,13 +423,13 @@
 ]]><![CDATA[		
  		}
 	]]></script>
- <g id="os" transform="translate(3.1999999999999993 479.26)" class="layer">
-  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="250.06"/>
-  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="250.06" height="9.3" x="-125.33">OS</text>
-  <g class="layer-detail" transform="translate(194.59999999999997 3.2)">
-   <rect x="-181.79999999999995" class="layer" y="-3.2" width="2009.1" height="250.06"/>
+ <g id="os" transform="translate(3.1999999999999993 418.63)" class="layer">
+  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="227.03"/>
+  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="227.03" height="9.3" x="-113.815">OS</text>
+  <g class="layer-detail" transform="translate(516.9500000000003 3.2)">
+   <rect x="-504.1500000000003" class="layer" y="-3.2" width="4844.4" height="227.03"/>
    <g>
-    <g id="kernelhwsrv" class="package" transform="translate( 0 142.23)">
+    <g id="kernelhwsrv" class="package" transform="translate( 0 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
      <rect class="package" x="0" width="63.300000000000004" height="101.43" y="0" style="fill:tan;"/>
      <text text-anchor="middle" class="package" width="63.300000000000004" x="31.650000000000002" y="100.43">Kernel &amp; HW Services</text>
@@ -533,7 +533,7 @@
       </g>
      </g>
     </g>
-    <g id="boardsupport" class="package" transform="translate( 65.4 142.23)">
+    <g id="boardsupport" class="package" transform="translate( 65.4 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:tan;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Board Support</text>
@@ -575,7 +575,7 @@
       </g>
      </g>
     </g>
-    <g id="buildtools" class="package" transform="translate( 95.4 142.23)">
+    <g id="buildtools" class="package" transform="translate( 95.4 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="45.6" height="101.43" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="45.6" x="22.8" y="100.43">Build Tools</text>
@@ -676,10 +676,472 @@
     </g>
     <g id="ossrv" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="152.1" height="139.03" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="152.1" x="76.05" y="123.80000000000001" dy="0.375em">Generic OS Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="stdlibs" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="968.699999999999" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="968.699999999999" x="484.3499999999995" y="105" dy="0.375em">Generic OS Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="ossrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="827.6999999999989"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="826.2999999999989" height="6.299999999999999">Generic OS Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="boost_apis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Boost APIs</text>
+        </g>
+        <g id="cpp_wrappers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Cpp wrappers</text>
+        </g>
+        <g id="character_type_apis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Character Type APIs</text>
+        </g>
+        <g id="compiler_specific_runtime_support" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Compiler Specific Runtime Support</text>
+        </g>
+        <g id="crypto_authentication_codes_and_hash_functions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Crypto Authentication Codes and Hash Functions API</text>
+        </g>
+        <g id="crypto_auxillary_functions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Crypto Auxillary Functions API</text>
+        </g>
+        <g id="crypto_certificates_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Crypto Certificates API</text>
+        </g>
+        <g id="crypto_inputoutput_and_data_encoding_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Crypto Input/Output and Data Encoding API</text>
+        </g>
+        <g id="crypto_public_key_cryptography_and_key_agreement_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Crypto Public Key Cryptography and Key Agreement API</text>
+        </g>
+        <g id="crypto_symmetric_ciphers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Crypto Symmetric Ciphers API</text>
+        </g>
+        <g id="crypto_utility_functions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Crypto Utility Functions API</text>
+        </g>
+        <g id="cryptogaphy_related_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Cryptogaphy Related API</text>
+        </g>
+        <g id="gboxed" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">GBoxed API</text>
+        </g>
+        <g id="glib_arrays" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Glib Arrays API</text>
+        </g>
+        <g id="glib_asynchronous_queues" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Glib Asynchronous Queues API</text>
+        </g>
+        <g id="glib_atomic_operations" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Glib Atomic Operations API</text>
+        </g>
+        <g id="glib_automatic_string_completion" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Glib Automatic String Completion API</text>
+        </g>
+        <g id="glib_balanced_binary_trees" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Glib Balanced Binary Trees API</text>
+        </g>
+        <g id="glib_basic_types" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Glib Basic Types API</text>
+        </g>
+        <g id="glib_caches" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Glib Caches API</text>
+        </g>
+        <g id="glib_character_set_conversion" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Glib Character Set Conversion API</text>
+        </g>
+        <g id="glib_closures" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Glib Closures API</text>
+        </g>
+        <g id="glib_commandline_option_parser" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Glib Command Line Option Parser API</text>
+        </g>
+        <g id="glib_datasets" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Glib Datasets API</text>
+        </g>
+        <g id="glib_date_and_time_functions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Glib Date and Time Functions API</text>
+        </g>
+        <g id="glib_doubleended_queues" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Glib Double-ended Queues API</text>
+        </g>
+        <g id="glib_doublylinked_lists" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Glib Doubly-Linked Lists API</text>
+        </g>
+        <g id="glib_dynamic_loading_of_modules" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Glib Dynamic Loading of Modules API</text>
+        </g>
+        <g id="glib_enums_and_flags" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Glib Enums and Flags API</text>
+        </g>
+        <g id="glib_error_reporting" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Glib Error Reporting API</text>
+        </g>
+        <g id="glib_file_utilities" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Glib File Utilities API</text>
+        </g>
+        <g id="glib_generic_values" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Glib Generic Values API</text>
+        </g>
+        <g id="glib_globstyle_pattern_matching" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">Glib Glob-Style Pattern Matching API</text>
+        </g>
+        <g id="glib_hash_tables" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Glib Hash Tables API</text>
+        </g>
+        <g id="glib_hook_functions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Glib Hook Functions API</text>
+        </g>
+        <g id="glib_internationalization" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">Glib  Internationalization API</text>
+        </g>
+        <g id="glib_io_channels" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">Glib I/O Channels API</text>
+        </g>
+        <g id="glib_keyvalue_file_parser" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Glib Key-Value File Parser API</text>
+        </g>
+        <g id="glib_lexical_scanner" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Glib Lexical Scanner API</text>
+        </g>
+        <g id="glib_main_event_loop" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">Glib Main Event Loop API</text>
+        </g>
+        <g id="glib_memory_allocation" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Glib Memory Allocation API</text>
+        </g>
+        <g id="glib_memory_slices" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">Glib Memory Slices API</text>
+        </g>
+        <g id="glib_message_logging" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">Glib Message Logging API</text>
+        </g>
+        <g id="glib_miscellaneous_utility_functions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Glib Miscellaneous Utility Functions API</text>
+        </g>
+        <g id="glib_nary_trees" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Glib N-ary Trees API</text>
+        </g>
+        <g id="glib_parameters_and_values" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">Glib Parameters and Values API</text>
+        </g>
+        <g id="glib_quarks" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Glib Quarks API</text>
+        </g>
+        <g id="glib_random_numbers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Glib Random Numbers API</text>
+        </g>
+        <g id="glib_relations_and_tuples" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="446.4000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="451.05000000000035">Glib Relations and Tuples API</text>
+        </g>
+        <g id="glib_shellrelated_utilities" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="455.7000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="460.35000000000036">Glib Shell-related Utilities API</text>
+        </g>
+        <g id="glib_signals" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="465.0000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="469.6500000000004">Glib Signals API</text>
+        </g>
+        <g id="glib_simple_xml_subset_parser" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="474.3000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="478.9500000000004">Glib Simple XML Subset Parser API</text>
+        </g>
+        <g id="glib_singlylinked_lists" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="483.6000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="488.2500000000004">Glib Singly-Linked Lists API</text>
+        </g>
+        <g id="glib_spawning_processes" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="492.90000000000043" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="497.5500000000004">Glib Spawning Processes API</text>
+        </g>
+        <g id="glib_standard_macros" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="502.20000000000044" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="506.8500000000004">Glib Standard Macros API</text>
+        </g>
+        <g id="glib_string_utility_functions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="511.50000000000045" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="516.1500000000004">Glib String Utility Functions API</text>
+        </g>
+        <g id="glib_strings" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="520.8000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="525.4500000000004">Glib Strings API</text>
+        </g>
+        <g id="glib_thread_pools" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="530.1000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="534.7500000000003">Glib Thread Pools API</text>
+        </g>
+        <g id="glib_threads" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="539.4000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="544.0500000000003">Glib Threads API</text>
+        </g>
+        <g id="glib_timers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="548.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="553.3500000000003">Glib Timers API</text>
+        </g>
+        <g id="glib_unicode_manipulation" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="558.0000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="562.6500000000002">Glib Unicode Manipulation API</text>
+        </g>
+        <g id="glib_value_arrays" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="567.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="571.9500000000002">Glib Value Arrays API</text>
+        </g>
+        <g id="glib_varargs_value_collection" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="576.6000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="581.2500000000001">Glib Varargs Value Collection API</text>
+        </g>
+        <g id="gobject" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="585.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="590.5500000000001">GObject API</text>
+        </g>
+        <g id="gparamspec" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="595.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="599.85">GParamSpec API</text>
+        </g>
+        <g id="gtype" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="604.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="609.15">GType API</text>
+        </g>
+        <g id="gtypemodule" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="613.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="618.4499999999999">GTypeModule API</text>
+        </g>
+        <g id="gtypeplugin" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="623.0999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="627.7499999999999">GTypePlugin API</text>
+        </g>
+        <g id="io_stream_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="632.3999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="637.0499999999998">I/O stream API</text>
+        </g>
+        <g id="localization_function_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="641.6999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="646.3499999999998">Localization Function API</text>
+        </g>
+        <g id="math_operations_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="650.9999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="655.6499999999998">Math Operations API</text>
+        </g>
+        <g id="no_namespace_headers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="660.2999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="664.9499999999997">No Namespace Headers</text>
+        </g>
+        <g id="openc_headers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="669.5999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="674.2499999999997">OpenC headers</text>
+        </g>
+        <g id="openc_wrappers" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="678.8999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="683.5499999999996">OpenC wrappers</text>
+        </g>
+        <g id="ssl_general_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="688.1999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="692.8499999999996">SSL General API</text>
+        </g>
+        <g id="ssl_protocol_methods_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="697.4999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="702.1499999999995">SSL Protocol Methods API</text>
+        </g>
+        <g id="standard_compressiondecompression_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="706.7999999999995" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="711.4499999999995">Standard Compression/Decompression API</text>
+        </g>
+        <g id="stl" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="716.0999999999995" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="720.7499999999994">STL API</text>
+        </g>
+        <g id="thread_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="725.3999999999994" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="730.0499999999994">Thread API</text>
+        </g>
+        <g id="type_attributes" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="734.6999999999994" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="739.3499999999993">Type Attributes API</text>
+        </g>
+        <g id="typeinfo" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="743.9999999999993" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="748.6499999999993">Type Info API</text>
+        </g>
+        <g id="utility_apis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="753.2999999999993" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="757.9499999999993">Utility APIs</text>
+        </g>
+        <g id="wide_character_classapis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="762.5999999999992" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="767.2499999999992">Wide character class/apis</text>
+        </g>
+        <g id="dbus-glib" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="771.8999999999992" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="776.5499999999992">Dbus-glib API</text>
+        </g>
+        <g id="configuration" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="781.1999999999991" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="785.8499999999991">configuration</text>
+        </g>
+        <g id="debug" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="790.4999999999991" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="795.1499999999991">debug</text>
+        </g>
+        <g id="exceptions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="799.799999999999" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="804.449999999999">exceptions</text>
+        </g>
+        <g id="memory" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="809.099999999999" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="813.749999999999">memory</text>
+        </g>
+        <g id="dbus" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="818.399999999999" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="823.0499999999989">dbus</text>
+        </g>
+       </g>
+      </g>
+      <g id="ossrv_plat" transform="translate(829.7999999999989 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Generic OS Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="libutils" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">libutils</text>
+        </g>
+       </g>
+      </g>
+      <g id="stdlibs" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Standard Libraries</text>
        <g transform="translate(0 6.299999999999999)">
@@ -695,7 +1157,7 @@
         </g>
        </g>
       </g>
-      <g id="ssl" transform="translate(0 37.6)" class="collection">
+      <g id="ssl" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">SSL</text>
        <g transform="translate(0 6.299999999999999)">
@@ -712,43 +1174,23 @@
         </g>
        </g>
       </g>
-      <g id="glib" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">GLib</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="glibbackend" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">GLib Backend</text>
-        </g>
-        <g id="libglib" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">GLib Library</text>
-        </g>
-        <g id="libgthread" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Libg Thread</text>
-        </g>
-        <g id="libgmodule" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Libg Module</text>
-        </g>
-        <g id="libgobject" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Libg Object</text>
-        </g>
-       </g>
-      </g>
-      <g id="stdcpp" transform="translate(20.700000000000003 56.400000000000006)" class="collection placeholder">
+      <g id="glib" transform="translate(847.499999999999 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">GLib</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="build" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">build</text>
+        </g>
+       </g>
+      </g>
+      <g id="stdcpp" transform="translate(20.700000000000003 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">C++ Standard Library</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="ofdbus" transform="translate(48.6 18.8)" class="collection">
+      <g id="ofdbus" transform="translate(865.1999999999989 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Open Found­ation D-Bus</text>
        <g transform="translate(0 6.299999999999999)">
@@ -764,7 +1206,7 @@
         </g>
        </g>
       </g>
-      <g id="utilitylibraries" transform="translate(0 75.2)" class="collection">
+      <g id="utilitylibraries" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Utility Libraries</text>
        <g transform="translate(0 6.299999999999999)">
@@ -775,7 +1217,7 @@
         </g>
        </g>
       </g>
-      <g id="genericservices" transform="translate(69.3 18.8)" class="collection">
+      <g id="genericservices" transform="translate(885.899999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Generic Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -817,7 +1259,7 @@
         </g>
        </g>
       </g>
-      <g id="compressionlibs" transform="translate(20.700000000000003 37.6)" class="collection">
+      <g id="compressionlibs" transform="translate(20.700000000000003 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Compres­sion Libraries</text>
        <g transform="translate(0 6.299999999999999)">
@@ -828,9 +1270,9 @@
         </g>
        </g>
       </g>
-      <g id="genericopenlibs" transform="translate(38.400000000000006 56.400000000000006)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Generic Open Libraries</text>
+      <g id="genericopenlibs" transform="translate(38.400000000000006 37.6)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Generic Open Libraries</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="cstdlib" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -852,9 +1294,14 @@
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">POSIX Realtime Ext.</text>
         </g>
-       </g>
-      </g>
-      <g id="lowlevellibsandfws" transform="translate(0 94)" class="collection">
+        <g id="liboil" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Liboil</text>
+        </g>
+       </g>
+      </g>
+      <g id="lowlevellibsandfws" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Low Level Libs &amp; Fmwks.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -875,7 +1322,7 @@
         </g>
        </g>
       </g>
-      <g id="ossrv_info" transform="translate(136.5 18.8)" class="collection">
+      <g id="ossrv_info" transform="translate(953.099999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Generic OS Services Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -887,33 +1334,12 @@
         </g>
        </g>
       </g>
-      <g id="rom" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">rom</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="ossrv_plat" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">ossrv_plat</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="libutils" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">libutils</text>
-        </g>
-       </g>
-      </g>
-      <g id="ossrv_pub" transform="translate(35.4 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">ossrv_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="persistentdata" class="package" transform="translate( 154.2 0)">
+     </g>
+    </g>
+    <g id="persistentdata" class="package" transform="translate( 970.799999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="67.19999999999999" height="139.03" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="138.03">Persistent Data Services</text>
+     <rect class="package" x="0" width="67.19999999999999" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="105" dy="0.375em">Persistent Data Services</text>
      <g transform="translate(0 3.2)">
       <g id="featuremgmt" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -1015,12 +1441,334 @@
       </g>
      </g>
     </g>
-    <g id="devicesrv" class="package" transform="translate( 223.49999999999997 0)">
+    <g id="devicesrv" class="package" transform="translate( 1040.099999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="129.29999999999998" height="139.03" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="129.29999999999998" x="64.64999999999999" y="123.80000000000001" dy="0.375em">Dev­ice Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="accessoryservices" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="680.4000000000004" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="680.4000000000004" x="340.2000000000002" y="105" dy="0.375em">Dev­ice Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="devicesrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Dev­ice Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="platform_path_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Platform Path Definitions API</text>
+        </g>
+        <g id="common_platform_security_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Common Platform Security Definitions API</text>
+        </g>
+        <g id="feature_discovery_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Feature Discovery API</text>
+        </g>
+        <g id="platform_environment_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Platform Environment API</text>
+        </g>
+        <g id="sensor_channel_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Sensor Channel API</text>
+        </g>
+        <g id="sensor_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Sensor Definitions API</text>
+        </g>
+        <g id="version_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Version Info API</text>
+        </g>
+        <g id="accessory_monitoring_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Accessory Monitoring API</text>
+        </g>
+        <g id="haptics_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Haptics API</text>
+        </g>
+        <g id="sensor_data_compensator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Sensor Data Compensator API</text>
+        </g>
+        <g id="platform_path_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Platform Path Definitions API</text>
+        </g>
+       </g>
+      </g>
+      <g id="devicesrv_plat" transform="translate(104.39999999999998 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="474.3000000000004"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="472.90000000000043" height="6.299999999999999">Dev­ice Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="configuration_file_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Configuration File Parser API</text>
+        </g>
+        <g id="dos_extension_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">DOS Extension Plug-In API</text>
+        </g>
+        <g id="mediator_command_initiator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Mediator Command Initiator API</text>
+        </g>
+        <g id="syslangutil_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">SysLangUtil API</text>
+        </g>
+        <g id="wakeup_alarm_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Wakeup Alarm API</text>
+        </g>
+        <g id="disk_and_memory_level_keys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Disk and Memory Level Keys API</text>
+        </g>
+        <g id="mediator_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Mediator Plugin API</text>
+        </g>
+        <g id="headset_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Headset Status API</text>
+        </g>
+        <g id="system_startup_extension_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">System Startup Extension Plugin API</text>
+        </g>
+        <g id="sensor_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Sensor Plugin API</text>
+        </g>
+        <g id="accessory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Accessory API</text>
+        </g>
+        <g id="display_language_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Display Language Definition API</text>
+        </g>
+        <g id="mediator_command_responder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Mediator Command Responder API</text>
+        </g>
+        <g id="accessory_policy_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Accessory Policy Definitions API</text>
+        </g>
+        <g id="hw_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Hardware Settings API</text>
+        </g>
+        <g id="mediator_domain_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Mediator Domain Definitions API</text>
+        </g>
+        <g id="sensor_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Sensor Extension API</text>
+        </g>
+        <g id="accessory_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Accessory Plugin API</text>
+        </g>
+        <g id="sae_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">SAE API</text>
+        </g>
+        <g id="accessory_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Accessory Control API</text>
+        </g>
+        <g id="mediator_static_registration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Mediator Static Registration API</text>
+        </g>
+        <g id="accessory_key_event_handling_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Accessory Key Event Handling API</text>
+        </g>
+        <g id="mediator_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Mediator Notification API</text>
+        </g>
+        <g id="accessory_policy_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Accessory Policy Utility API</text>
+        </g>
+        <g id="common_dsy_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Common DSY Plugin API</text>
+        </g>
+        <g id="remote_control_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Remote Control Extension API</text>
+        </g>
+        <g id="sensor_channel_filter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Sensor Channel Filter API</text>
+        </g>
+        <g id="dos_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">DOS Extension API</text>
+        </g>
+        <g id="accessory_audio_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Accessory Audio Control API</text>
+        </g>
+        <g id="mediator_event_consumer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Mediator Event Consumer API</text>
+        </g>
+        <g id="shared_data_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Shared Data API</text>
+        </g>
+        <g id="accessory_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Accessory Settings API</text>
+        </g>
+        <g id="accessory_bluetooth_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">Accessory Bluetooth Control API</text>
+        </g>
+        <g id="extended_version_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Extended Version Info API</text>
+        </g>
+        <g id="mediator_event_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Mediator Event Provider API</text>
+        </g>
+        <g id="tv_out_config_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">TV Out Config API</text>
+        </g>
+        <g id="tspclientmapper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">TSP Client Mapper API</text>
+        </g>
+        <g id="powersave_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Power Save API</text>
+        </g>
+        <g id="powersave_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Power Save Definitions API</text>
+        </g>
+        <g id="powersave_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">Power Save Plugin API</text>
+        </g>
+        <g id="extended_version_info_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Extended Version Info Plugin API</text>
+        </g>
+        <g id="haptics_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">Haptics Plugin API</text>
+        </g>
+        <g id="haptics_effect_data_getter_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">Haptics Effect Data Getter Plugin API</text>
+        </g>
+        <g id="haptics_packetizer_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Haptics Packetizer Plugin API</text>
+        </g>
+        <g id="tiltcompensation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Tilt Compensation API</text>
+        </g>
+        <g id="disk_notification_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">Disk Notification Handler API</text>
+        </g>
+        <g id="accessory_policy_usb_audio_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Accessory Policy USB Audio API</text>
+        </g>
+        <g id="accessory_policy_hdmi_audio_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Accessory Policy HDMI Audio API</text>
+        </g>
+        <g id="sensor_data_compensator_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="446.4000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="451.05000000000035">Sensor Data Compensator Plugin API</text>
+        </g>
+        <g id="ddc_access_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="455.7000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="460.35000000000036">DDC Access API</text>
+        </g>
+        <g id="tv_out_behaviour_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="465.0000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="469.6500000000004">TV Out Behaviour API</text>
+        </g>
+       </g>
+      </g>
+      <g id="accessoryservices" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Accessory Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1066,7 +1814,7 @@
         </g>
        </g>
       </g>
-      <g id="commonservices" transform="translate(0 18.8)" class="collection">
+      <g id="commonservices" transform="translate(580.8000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Common Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1097,7 +1845,7 @@
         </g>
        </g>
       </g>
-      <g id="dosservices" transform="translate(0 94)" class="collection">
+      <g id="dosservices" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Domestic Operating System Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1113,7 +1861,7 @@
         </g>
        </g>
       </g>
-      <g id="sensorservices" transform="translate(76.49999999999999 56.400000000000006)" class="collection">
+      <g id="sensorservices" transform="translate(76.49999999999999 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Sensor Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1139,7 +1887,7 @@
         </g>
        </g>
       </g>
-      <g id="hwrmhaptics" transform="translate(0 75.2)" class="collection">
+      <g id="hwrmhaptics" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">HWRM Haptics</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1175,12 +1923,12 @@
         </g>
        </g>
       </g>
-      <g id="mediator" transform="translate(48.6 18.8)" class="collection placeholder">
+      <g id="mediator" transform="translate(629.4000000000003 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Mediator</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="psmservices" transform="translate(66.3 18.8)" class="collection">
+      <g id="psmservices" transform="translate(647.1000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Power Save Mode Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1191,7 +1939,7 @@
         </g>
        </g>
       </g>
-      <g id="resourcemgmt" transform="translate(20.700000000000003 94)" class="collection">
+      <g id="resourcemgmt" transform="translate(20.700000000000003 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Resource Manage­ment</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1223,7 +1971,7 @@
         </g>
        </g>
       </g>
-      <g id="sysstatemgmt" transform="translate(0 37.6)" class="collection">
+      <g id="sysstatemgmt" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="111.59999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="110.19999999999997" height="6.299999999999999">System State Mgmt.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1289,7 +2037,7 @@
         </g>
        </g>
       </g>
-      <g id="resourceinterfaces" transform="translate(69.3 94)" class="collection">
+      <g id="resourceinterfaces" transform="translate(69.3 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Resource Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1300,7 +2048,7 @@
         </g>
        </g>
       </g>
-      <g id="systemhealthmanagement" transform="translate(113.69999999999997 37.6)" class="collection">
+      <g id="systemhealthmanagement" transform="translate(113.69999999999997 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">System Health Mgmt.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1311,7 +2059,7 @@
         </g>
        </g>
       </g>
-      <g id="devicesrv_info" transform="translate(84 18.8)" class="collection">
+      <g id="devicesrv_info" transform="translate(664.8000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Dev­ice Services Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1323,28 +2071,12 @@
         </g>
        </g>
       </g>
-      <g id="devicesrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">devicesrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="devicesrv_pub" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">devicesrv_pub</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="platform_path_definitions_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">platform_path_definitions_api</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="security" class="package" transform="translate( 354.9 0)">
+     </g>
+    </g>
+    <g id="security" class="package" transform="translate( 1722.5999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="74.7" height="139.03" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="74.7" x="37.35" y="138.03">OS Security</text>
+     <rect class="package" x="0" width="93.3" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="93.3" x="46.65" y="105" dy="0.375em">OS Security</text>
      <g transform="translate(0 3.2)">
       <g id="authenticationservices" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -1374,8 +2106,8 @@
        </g>
       </g>
       <g id="contentmgmt" transform="translate(38.400000000000006 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Content Manage­ment</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Content Manage­ment</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="contentaccessfwfordrm" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -1387,6 +2119,17 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 2; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">CAF Recogniser Config</text>
         </g>
+        <g id="referencedrmagent" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Reference DRM Agent</text>
+        </g>
+        <g id="cafstreamingsupport" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">CAF Streaming Support</text>
+        </g>
        </g>
       </g>
       <g id="crypto" transform="translate(0 56.400000000000006)" class="collection">
@@ -1455,8 +2198,8 @@
        </g>
       </g>
       <g id="cryptoservices" transform="translate(17.7 75.2)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Crypto Services</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Crypto Services</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="certificateandkeymgmt" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -1468,19 +2211,24 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">File-based Certificate &amp; Key Stores</text>
         </g>
-        <g id="asnpkcs" class="component">
+        <g id="rootcertificates" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
          <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">ASN PKCS</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Root Certificates</text>
+        </g>
+        <g id="asnpkcs" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">ASN PKCS</text>
         </g>
         <g id="browserrootcertificates" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">browserrootcertificates</text>
-        </g>
-       </g>
-      </g>
-      <g id="security_info" transform="translate(59.10000000000001 0)" class="collection">
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">browserrootcertificates</text>
+        </g>
+       </g>
+      </g>
+      <g id="security_info" transform="translate(77.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">OS Security Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1494,10 +2242,10 @@
       </g>
      </g>
     </g>
-    <g id="lbs" class="package" transform="translate( 431.7 0)">
+    <g id="lbs" class="package" transform="translate( 1817.9999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="64.2" height="139.03" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="64.2" x="32.1" y="138.03">Locating Services</text>
+     <rect class="package" x="0" width="64.2" height="116.00000000000001" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="64.2" x="32.1" y="115.00000000000001">Locating Services</text>
      <g transform="translate(0 3.2)">
       <g id="datasourcemodules" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
@@ -1652,10 +2400,10 @@
       </g>
      </g>
     </g>
-    <g id="commsfw" class="package" transform="translate( 498 0)">
+    <g id="commsfw" class="package" transform="translate( 1884.2999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="57.00000000000001" height="139.03" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="138.03">Comms Frame­work</text>
+     <rect class="package" x="0" width="57.00000000000001" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="115.00000000000001">Comms Frame­work</text>
      <g transform="translate(0 3.2)">
       <g id="commsprocess" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -1804,10 +2552,10 @@
       </g>
      </g>
     </g>
-    <g id="networkingsrv" class="package" transform="translate( 557.1 0)">
+    <g id="networkingsrv" class="package" transform="translate( 1943.3999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="170.70000000000002" height="139.03" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="138.03">Network­ing Services</text>
+     <rect class="package" x="0" width="170.70000000000002" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="105" dy="0.375em">Network­ing Services</text>
      <g transform="translate(0 3.2)">
       <g id="esockapiextensions" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2064,12 +2812,104 @@
       </g>
      </g>
     </g>
-    <g id="wlan" class="package" transform="translate( 729.9 0)">
+    <g id="wlan" class="package" transform="translate( 2116.1999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="55.8" height="139.03" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="105" dy="0.375em">WLAN</text>
-     <g transform="translate(0 3.2)">
-      <g id="wlan_bearer" transform="translate(0 112.80000000000001)" class="collection">
+     <rect class="package" x="0" width="174.89999999999998" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="174.89999999999998" x="87.44999999999999" y="86.2" dy="0.375em">WLAN</text>
+     <g transform="translate(0 3.2)">
+      <g id="wlan_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="139.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="138.1" height="6.299999999999999">WLAN Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wlan_dbif_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">WLAN DBIF API</text>
+        </g>
+        <g id="wlan_hal_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">WLAN HAL API</text>
+        </g>
+        <g id="wlan_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">WLAN Management API</text>
+        </g>
+        <g id="wlan_device_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">WLAN Device Settings API</text>
+        </g>
+        <g id="wlan_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">WLAN Control API</text>
+        </g>
+        <g id="wlan_hw_initialization_data_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">WLAN Hardware Initialization Data API</text>
+        </g>
+        <g id="wlan_power_save_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">WLAN Power Save Plugin API</text>
+        </g>
+        <g id="wlan_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">WLAN Info API</text>
+        </g>
+        <g id="wlan_agent_hotspot_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">WLAN Agent Hotspot Plug-in API</text>
+        </g>
+        <g id="wlan_osa_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">WLAN OSA API</text>
+        </g>
+        <g id="wlan_spia_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">WLAN SPIA API</text>
+        </g>
+        <g id="wlan_hpa_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">WLAN HPA API</text>
+        </g>
+        <g id="wlan_eapol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">WLAN EAPOL Plugin API</text>
+        </g>
+        <g id="wlan_generic_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">WLAN Generic Plugin API</text>
+        </g>
+        <g id="wlan_aws_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">WLAN AWS Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="wlan_pub" transform="translate(141.6 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">WLAN Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wlan_sdk_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">WLAN SDK Info API</text>
+        </g>
+       </g>
+      </g>
+      <g id="wlan_bearer" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">WLAN Bearer</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2105,7 +2945,7 @@
         </g>
        </g>
       </g>
-      <g id="wlan_info" transform="translate(0 18.8)" class="collection">
+      <g id="wlan_info" transform="translate(159.29999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">WLAN Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2117,22 +2957,12 @@
         </g>
        </g>
       </g>
-      <g id="wlan_pub" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">wlan_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="wlan_plat" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">wlan_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="cellularsrv" class="package" transform="translate( 787.8 0)">
+     </g>
+    </g>
+    <g id="cellularsrv" class="package" transform="translate( 2293.1999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="101.39999999999998" height="139.03" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="138.03">Cellular Baseband Services</text>
+     <rect class="package" x="0" width="101.39999999999998" height="116.00000000000001" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="85.79999999999998" x="58.499999999999986" y="86.2" dy="0.375em">Cellular Baseband Services</text>
      <g transform="translate(0 3.2)">
       <g id="basebandabstraction" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2156,17 +2986,6 @@
         </g>
        </g>
       </g>
-      <g id="fax" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Fax</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="faxclientandserver" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Fax Client &amp; Server</text>
-        </g>
-       </g>
-      </g>
       <g id="smsprotocols" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SMS Protocols</text>
@@ -2229,7 +3048,7 @@
         </g>
        </g>
       </g>
-      <g id="telephonyserver" transform="translate(17.7 18.8)" class="collection">
+      <g id="telephonyserver" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Telephony Server</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2354,12 +3173,33 @@
       </g>
      </g>
     </g>
-    <g id="bt" class="package" transform="translate( 891.3 0)">
+    <g id="bt" class="package" transform="translate( 2396.6999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="65.1" height="139.03" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="123.80000000000001" dy="0.375em">Blue­tooth</text>
-     <g transform="translate(0 3.2)">
-      <g id="bluetooth" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="65.1" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="105" dy="0.375em">Blue­tooth</text>
+     <g transform="translate(0 3.2)">
+      <g id="bt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Bluetooth Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="bluetooth_audio_adaptation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Bluetooth Audio Adaptation API</text>
+        </g>
+        <g id="bluetooth_power_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Bluetooth Power Management API</text>
+        </g>
+        <g id="at_command_handler_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">AT Command Handler Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="bluetooth" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Blue­tooth Core</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2401,7 +3241,7 @@
         </g>
        </g>
       </g>
-      <g id="bluetoothmgmt" transform="translate(0 75.2)" class="collection">
+      <g id="bluetoothmgmt" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Blue­tooth Manage­ment</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2427,7 +3267,7 @@
         </g>
        </g>
       </g>
-      <g id="bluetoothcommsprofiles" transform="translate(0 18.8)" class="collection">
+      <g id="bluetoothcommsprofiles" transform="translate(30.000000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Btooth. Comms Profiles</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2438,7 +3278,7 @@
         </g>
        </g>
       </g>
-      <g id="bthci" transform="translate(0 37.6)" class="collection">
+      <g id="bthci" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Host Contrllr. Inter­face</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2459,7 +3299,7 @@
         </g>
        </g>
       </g>
-      <g id="irda" transform="translate(39.300000000000004 75.2)" class="collection">
+      <g id="irda" transform="translate(39.300000000000004 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">IrDA</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2470,12 +3310,12 @@
         </g>
        </g>
       </g>
-      <g id="atext" transform="translate(30.000000000000004 37.6)" class="collection placeholder">
+      <g id="atext" transform="translate(30.000000000000004 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">AT Extensions</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="bt_info" transform="translate(17.7 18.8)" class="collection">
+      <g id="bt_info" transform="translate(47.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Blue­tooth Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2487,19 +3327,25 @@
         </g>
        </g>
       </g>
-      <g id="bt_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">bt_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="usb" class="package" transform="translate( 958.4999999999999 0)">
+     </g>
+    </g>
+    <g id="usb" class="package" transform="translate( 2463.899999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="139.03" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="123.80000000000001" dy="0.375em">USB</text>
-     <g transform="translate(0 3.2)">
-      <g id="usbmgmt" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">USB</text>
+     <g transform="translate(0 3.2)">
+      <g id="usb_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">USB Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="usb_audio_stream_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">USB Audio Stream Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="usbmgmt" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">USB Manage­ment</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2516,7 +3362,7 @@
         </g>
        </g>
       </g>
-      <g id="usb_info" transform="translate(0 18.8)" class="collection">
+      <g id="usb_info" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">USB Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2528,19 +3374,421 @@
         </g>
        </g>
       </g>
-      <g id="usb_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">usb_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="mm" class="package" transform="translate( 988.4999999999999 0)">
+     </g>
+    </g>
+    <g id="mm" class="package" transform="translate( 2499.2999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="140.69999999999996" height="139.03" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="107.39999999999996" x="86.99999999999997" y="11" dy="0.375em">Multi­media</text>
-     <g transform="translate(0 3.2)">
-      <g id="devsoundextensions" transform="translate(0 75.2)" class="collection">
+     <rect class="package" x="0" width="795.8999999999996" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="749.3999999999996" x="421.1999999999998" y="86.2" dy="0.375em">Multi­media</text>
+     <g transform="translate(0 3.2)">
+      <g id="mm_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">MM Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="audio_effects_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Audio Effects API</text>
+        </g>
+        <g id="audio_effects_presets_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Audio Effects Presets API</text>
+        </g>
+        <g id="drm_audio_player_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">DRM Audio Player API</text>
+        </g>
+        <g id="multimedia_extension_interfaces_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Multimedia Extension Interfaces API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mm_plat" transform="translate(39.300000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="697.4999999999996"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="696.0999999999996" height="6.299999999999999">MM Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="aac_decoder_config_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">AAC Decoder Config API</text>
+        </g>
+        <g id="aac_decoder_config_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AAC Decoder Config Msg Hdlr API</text>
+        </g>
+        <g id="aac_decoder_config_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">AAC Decoder Config Proxy API</text>
+        </g>
+        <g id="added_devsound_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Added DevSound Control API</text>
+        </g>
+        <g id="added_devsound_control_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Added DevSound Control Msg Hdlr API</text>
+        </g>
+        <g id="added_devsound_control_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Added DevSound Control Proxy API</text>
+        </g>
+        <g id="audio_effects_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Audio Effects Message Handler API</text>
+        </g>
+        <g id="audio_effects_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Audio Effects Proxy API</text>
+        </g>
+        <g id="audio_policy_header_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Audio Policy Header API</text>
+        </g>
+        <g id="audio_routing_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Audio Routing API</text>
+        </g>
+        <g id="audio_routing_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Audio Routing Msg Hdlr API</text>
+        </g>
+        <g id="audio_routing_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Audio Routing Proxy API</text>
+        </g>
+        <g id="custom_interface_builder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Custom Interface Builder API</text>
+        </g>
+        <g id="custom_interface_message_handler_factory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Custom Interface Message Handler Factory API</text>
+        </g>
+        <g id="custom_interface_proxy_factory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Custom Interface Proxy Factory API</text>
+        </g>
+        <g id="custom_interface_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Custom Interface Utility API</text>
+        </g>
+        <g id="devsound_adaptation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">DevSound Adaptation API</text>
+        </g>
+        <g id="display_posting_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Display Posting API</text>
+        </g>
+        <g id="eaac_plus_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">eAAC Plus Decoder Interface API</text>
+        </g>
+        <g id="eaac_plus_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">eAAC Plus Decoder Interface Message Handler API</text>
+        </g>
+        <g id="eaac_plus_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">eAAC Plus Decoder Interface Proxy API</text>
+        </g>
+        <g id="error_concealment_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Error Concealment Interface API</text>
+        </g>
+        <g id="error_concealment_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Error Concealment Interface Message Handler API</text>
+        </g>
+        <g id="error_concealment_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Error Concealment Interface Proxy API</text>
+        </g>
+        <g id="fm_radio_adaptation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">FM Radio Adaptation API</text>
+        </g>
+        <g id="g711_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">G711 Decoder Interface API</text>
+        </g>
+        <g id="g711_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">G711 Decoder Interface Message Handler API</text>
+        </g>
+        <g id="g711_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">G711 Decoder Interface Proxy API</text>
+        </g>
+        <g id="g711_encoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">G711 Encoder Interface API</text>
+        </g>
+        <g id="g711_encoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">G711 Encoder Interface Message Handler API</text>
+        </g>
+        <g id="g711_encoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">G711 Encoder Interface Proxy API</text>
+        </g>
+        <g id="g729_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">G729 Decoder Interface API</text>
+        </g>
+        <g id="g729_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">G729 Decoder Interface Message Handler API</text>
+        </g>
+        <g id="g729_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">G729 Decoder Interface Proxy API</text>
+        </g>
+        <g id="g729_encoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">G729 Encoder Interface API</text>
+        </g>
+        <g id="g729_encoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">G729 Encoder Interface Proxy API</text>
+        </g>
+        <g id="g729_encoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">G729 Encoder Interface Message Handler API</text>
+        </g>
+        <g id="global_audio_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Global Audio Settings API</text>
+        </g>
+        <g id="global_audio_settings_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Global Audio Settings Definition API</text>
+        </g>
+        <g id="ilbc_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">Ilbc Decoder Interface API</text>
+        </g>
+        <g id="ilbc_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Ilbc Decoder Interface Message Handler API</text>
+        </g>
+        <g id="ilbc_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">Ilbc Decoder Interface Proxy API</text>
+        </g>
+        <g id="ilbc_encoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">Ilbc Encoder Interface API</text>
+        </g>
+        <g id="ilbc_encoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Ilbc Encoder Interface Message Handler API</text>
+        </g>
+        <g id="ilbc_encoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Ilbc Encoder Interface Proxy API</text>
+        </g>
+        <g id="mdf_plugin_uids" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">MDF Plug-in UIDs</text>
+        </g>
+        <g id="multimedia_fourcc_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Multimedia FourCC Definitions API</text>
+        </g>
+        <g id="nokia_audio_policy_header_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Nokia Audio Policy Header API</text>
+        </g>
+        <g id="nokia_multimedia_fourcc_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="446.4000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="451.05000000000035">Nokia Multimedia Fourcc Definitions API</text>
+        </g>
+        <g id="ra8_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="455.7000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="460.35000000000036">RA8 Decoder Interface API</text>
+        </g>
+        <g id="ra8_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="465.0000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="469.6500000000004">RA8 Decoder Interface Message Handler API</text>
+        </g>
+        <g id="ra8_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="474.3000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="478.9500000000004">RA8 Decoder Interface Proxy API</text>
+        </g>
+        <g id="rds_adaptation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="483.6000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="488.2500000000004">RDS Adaptation API</text>
+        </g>
+        <g id="restricted_audio_output_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="492.90000000000043" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="497.5500000000004">Restricted Audio Output API</text>
+        </g>
+        <g id="restricted_audio_output_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="502.20000000000044" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="506.8500000000004">Restricted Audio Output Message Handler API</text>
+        </g>
+        <g id="restricted_audio_output_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="511.50000000000045" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="516.1500000000004">Restricted Audio Output Proxy API</text>
+        </g>
+        <g id="sbc_encoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="520.8000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="525.4500000000004">SBC Encoder Interface API</text>
+        </g>
+        <g id="sbc_encoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="530.1000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="534.7500000000003">SBC Encoder Interface Message Handler API</text>
+        </g>
+        <g id="sbc_encoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="539.4000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="544.0500000000003">SBC Encoder Interface Proxy API</text>
+        </g>
+        <g id="secure_output_mdf_custom_interface" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="548.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="553.3500000000003">Secure Output MDF Custom Interface</text>
+        </g>
+        <g id="speech_encoder_config_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="558.0000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="562.6500000000002">Speech Encoder Config API</text>
+        </g>
+        <g id="speech_encoder_config_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="567.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="571.9500000000002">Speech Encoder Config Message Handler API</text>
+        </g>
+        <g id="speech_encoder_config_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="576.6000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="581.2500000000001">Speech Encoder Config Proxy API</text>
+        </g>
+        <g id="telephony_audio_routing_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="585.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="590.5500000000001">Telephony Audio Routing Client API</text>
+        </g>
+        <g id="telephony_audio_routing_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="595.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="599.85">Telephony Audio Routing Manager API</text>
+        </g>
+        <g id="video_buffer_management_mdf_custom_interface" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="604.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="609.15">Video Buffer Management MDF Custom Interface</text>
+        </g>
+        <g id="video_decoder_rotation_mdf_custom_interface" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="613.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="618.4499999999999">Video Decoder Rotation MDF Custom Interface</text>
+        </g>
+        <g id="video_decoder_scaling_mdf_custom_interface" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="623.0999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="627.7499999999999">Video Decoder Scaling MDF Custom Interface</text>
+        </g>
+        <g id="video_reclaim_extbuffers_ci" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="632.3999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="637.0499999999998">Video Reclaim Extbuffers Custom Interface</text>
+        </g>
+        <g id="video_window_control_custom_interface" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="641.6999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="646.3499999999998">Video Window Control Custom Interface</text>
+        </g>
+        <g id="wma_decoder_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="650.9999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="655.6499999999998">WMA Decoder Interface API</text>
+        </g>
+        <g id="wma_decoder_interface_msg_hdlr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="660.2999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="664.9499999999997">WMA Decoder Interface Message Handler API</text>
+        </g>
+        <g id="wma_decoder_interface_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="669.5999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="674.2499999999997">WMA Decoder Interface Proxy API</text>
+        </g>
+        <g id="eaacplusutil_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="678.8999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="683.5499999999996">EAac Plus Util API</text>
+        </g>
+        <g id="frametable_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="688.1999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="692.8499999999996">Frametable API</text>
+        </g>
+       </g>
+      </g>
+      <g id="devsoundextensions" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Devsound Exten­sions</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2601,7 +3849,7 @@
         </g>
        </g>
       </g>
-      <g id="mdfdevvideoextensions" transform="translate(104.39999999999998 75.2)" class="collection">
+      <g id="mdfdevvideoextensions" transform="translate(104.39999999999998 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">MDF Dev Video Ext.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2612,7 +3860,7 @@
         </g>
        </g>
       </g>
-      <g id="audio" transform="translate(0 37.6)" class="collection">
+      <g id="audio" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Audio Codecs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2623,7 +3871,7 @@
         </g>
        </g>
       </g>
-      <g id="imagingandcamerafws" transform="translate(0 18.8)" class="collection">
+      <g id="imagingandcamerafws" transform="translate(738.8999999999996 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Imaging &amp; Camera Fmwks.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2639,7 +3887,7 @@
         </g>
        </g>
       </g>
-      <g id="mmlibs" transform="translate(17.7 37.6)" class="collection">
+      <g id="mmlibs" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Multi­media Libraries</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2655,7 +3903,7 @@
         </g>
        </g>
       </g>
-      <g id="mmplugins" transform="translate(38.400000000000006 37.6)" class="collection">
+      <g id="mmplugins" transform="translate(38.400000000000006 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Multi­media Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2681,7 +3929,7 @@
         </g>
        </g>
       </g>
-      <g id="mm_info" transform="translate(20.700000000000003 18.8)" class="collection">
+      <g id="mm_info" transform="translate(759.5999999999996 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Multi­media Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2699,7 +3947,7 @@
         </g>
        </g>
       </g>
-      <g id="mmresourcemgmt" transform="translate(77.7 37.6)" class="collection">
+      <g id="mmresourcemgmt" transform="translate(77.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">MM Resource Mgmt.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2711,7 +3959,7 @@
         </g>
        </g>
       </g>
-      <g id="mmdevicefw" transform="translate(122.09999999999998 75.2)" class="collection">
+      <g id="mmdevicefw" transform="translate(122.09999999999998 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Multi­media Dev­ice Fmwk.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2727,7 +3975,7 @@
         </g>
        </g>
       </g>
-      <g id="mmswadaptation" transform="translate(0 112.80000000000001)" class="collection">
+      <g id="mmswadaptation" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">MM SW Adapt.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2738,7 +3986,7 @@
         </g>
        </g>
       </g>
-      <g id="omxil" transform="translate(0 94)" class="collection">
+      <g id="omxil" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">OpenMAX IL</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2770,7 +4018,7 @@
         </g>
        </g>
       </g>
-      <g id="devsound" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="devsound" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Sound Dev­ice</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2822,7 +4070,7 @@
         </g>
        </g>
       </g>
-      <g id="mmhais" transform="translate(17.7 112.80000000000001)" class="collection">
+      <g id="mmhais" transform="translate(17.7 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">MM HW Adapt. Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2854,7 +4102,7 @@
         </g>
        </g>
       </g>
-      <g id="mmapitest" transform="translate(41.400000000000006 18.8)" class="collection">
+      <g id="mmapitest" transform="translate(780.2999999999996 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Multi­media API Tests</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2866,24 +4114,61 @@
         </g>
        </g>
       </g>
-      <g id="mm_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">mm_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="mm_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">mm_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="imagingext" class="package" transform="translate( 1131.2999999999997 0)">
+     </g>
+    </g>
+    <g id="imagingext" class="package" transform="translate( 3297.299999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="139.03" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="123.80000000000001" dy="0.375em">Imaging Exten­sions</text>
-     <g transform="translate(0 3.2)">
-      <g id="imageadaptationextensions" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="91.19999999999999" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="91.19999999999999" x="45.599999999999994" y="105" dy="0.375em">Imaging Exten­sions</text>
+     <g transform="translate(0 3.2)">
+      <g id="imagingext_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Imaging Ext. Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="exif_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Exif API</text>
+        </g>
+       </g>
+      </g>
+      <g id="imagingext_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Imaging Ext. Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="jpeg2000_icl_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">JPEG2000 ICL plugin API</text>
+        </g>
+        <g id="extended_icl_jpeg_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Extended ICL Jpeg API</text>
+        </g>
+        <g id="h324_annex_k_custom_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">H324 Annex K Custom API</text>
+        </g>
+        <g id="ecam_orientation_custom_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">ECam Orientation Custom API</text>
+        </g>
+        <g id="ecam_ui_orientation_override_custom_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">ECam UI Orientation Override Custom API</text>
+        </g>
+        <g id="ecam_face_tracking_custom_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">ECam Face Tracking Custom API</text>
+        </g>
+       </g>
+      </g>
+      <g id="imageadaptationextensions" transform="translate(75.6 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Image Adapt. Ext.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2894,7 +4179,7 @@
         </g>
        </g>
       </g>
-      <g id="imagingmodules" transform="translate(0 94)" class="collection">
+      <g id="imagingmodules" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Imaging Modules</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2910,24 +4195,14 @@
         </g>
        </g>
       </g>
-      <g id="imagingext_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">imagingext_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="imagingext_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">imagingext_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="graphics" class="package" transform="translate( 1166.6999999999998 0)">
+     </g>
+    </g>
+    <g id="graphics" class="package" transform="translate( 3390.599999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="93.3" height="139.03" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="77.7" x="54.449999999999996" y="11" dy="0.375em">Graphics</text>
-     <g transform="translate(0 3.2)">
-      <g id="graphicsaccelaration" transform="translate(0 112.80000000000001)" class="collection">
+     <rect class="package" x="0" width="95.4" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="76.80000000000001" x="57" y="29.8" dy="0.375em">Graphics</text>
+     <g transform="translate(0 3.2)">
+      <g id="graphicsaccelaration" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Graphics Acceleration</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2938,7 +4213,7 @@
         </g>
        </g>
       </g>
-      <g id="m3g" transform="translate(0 75.2)" class="collection">
+      <g id="m3g" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Mobile 3D Graphics</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2949,7 +4224,7 @@
         </g>
        </g>
       </g>
-      <g id="graphicsresourceservices" transform="translate(0 94)" class="collection">
+      <g id="graphicsresourceservices" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Graphics Resource Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2965,7 +4240,7 @@
         </g>
        </g>
       </g>
-      <g id="graphicsutils" transform="translate(20.700000000000003 94)" class="collection">
+      <g id="graphicsutils" transform="translate(20.700000000000003 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Graphics Utils</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2976,7 +4251,7 @@
         </g>
        </g>
       </g>
-      <g id="graphicshwdrivers" transform="translate(17.7 112.80000000000001)" class="collection">
+      <g id="graphicshwdrivers" transform="translate(17.7 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Graphics Hardware Drivers</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2987,7 +4262,7 @@
         </g>
        </g>
       </g>
-      <g id="graphicscomposition" transform="translate(38.400000000000006 94)" class="collection">
+      <g id="graphicscomposition" transform="translate(38.400000000000006 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Graphics Composi­tion</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3014,7 +4289,7 @@
         </g>
        </g>
       </g>
-      <g id="graphicstest" transform="translate(0 18.8)" class="collection">
+      <g id="graphicstest" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Graphics Test</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3026,7 +4301,18 @@
         </g>
        </g>
       </g>
-      <g id="graphics_info" transform="translate(17.7 18.8)" class="collection">
+      <g id="graphics_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Graphics Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="m3g_core_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">M3G Core API</text>
+        </g>
+       </g>
+      </g>
+      <g id="graphics_info" transform="translate(35.4 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Graphics Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3044,7 +4330,7 @@
         </g>
        </g>
       </g>
-      <g id="windowing" transform="translate(38.400000000000006 18.8)" class="collection">
+      <g id="windowing" transform="translate(56.099999999999994 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Windowing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3060,7 +4346,7 @@
         </g>
        </g>
       </g>
-      <g id="printingservices" transform="translate(59.10000000000001 18.8)" class="collection">
+      <g id="printingservices" transform="translate(76.80000000000001 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Printing Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3076,7 +4362,7 @@
         </g>
        </g>
       </g>
-      <g id="fbs" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="fbs" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Font &amp; Bitmap Server</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3087,7 +4373,7 @@
         </g>
        </g>
       </g>
-      <g id="opengles" transform="translate(17.7 75.2)" class="collection">
+      <g id="opengles" transform="translate(17.7 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">OpenGLES</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3098,7 +4384,7 @@
         </g>
        </g>
       </g>
-      <g id="openvg" transform="translate(35.4 75.2)" class="collection">
+      <g id="openvg" transform="translate(35.4 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">OpenVG</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3114,7 +4400,7 @@
         </g>
        </g>
       </g>
-      <g id="egl" transform="translate(56.099999999999994 75.2)" class="collection">
+      <g id="egl" transform="translate(56.099999999999994 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">EGL</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3141,7 +4427,7 @@
         </g>
        </g>
       </g>
-      <g id="graphicsdeviceinterface" transform="translate(17.7 56.400000000000006)" class="collection">
+      <g id="graphicsdeviceinterface" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Graphics Dev­ice Inter­face</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3182,7 +4468,7 @@
         </g>
        </g>
       </g>
-      <g id="graphicstools" transform="translate(0 37.6)" class="collection">
+      <g id="graphicstools" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Graphics Tools</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3200,24 +4486,45 @@
         </g>
        </g>
       </g>
-      <g id="graphics_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">graphics_plat</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="m3g_core_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">M3G Core API</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="textandloc" class="package" transform="translate( 1262.1 0)">
+     </g>
+    </g>
+    <g id="textandloc" class="package" transform="translate( 3488.099999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="120.3" height="139.03" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="120.3" x="60.15" y="138.03">Text &amp; Localis­ation Services</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="84.9" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="84.9" x="42.45" y="86.2" dy="0.375em">Text &amp; Localis­ation Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="textandloc_plat" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Text &amp; Localis­ation Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="findutil_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Find Utility API</text>
+        </g>
+        <g id="japanese_language_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Japanese Language Utilities API</text>
+        </g>
+        <g id="sortutil_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Sorting Utility API</text>
+        </g>
+       </g>
+      </g>
+      <g id="textandloc_pub" transform="translate(30.000000000000004 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Text &amp; Localis­ation Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="directory_localizer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Directory Localizer API</text>
+        </g>
+       </g>
+      </g>
       <g id="charconvfw" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Character Conver­sion</text>
@@ -3259,7 +4566,7 @@
         </g>
        </g>
       </g>
-      <g id="textandloc_info" transform="translate(0 18.8)" class="collection">
+      <g id="textandloc_info" transform="translate(47.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Text &amp; Localis­ation Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3329,24 +4636,19 @@
         </g>
        </g>
       </g>
-      <g id="textandloc_pub" transform="translate(87 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">textandloc_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="textandloc_plat" transform="translate(104.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">textandloc_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="xmlsrv" class="package" transform="translate( 1384.5 0)">
+     </g>
+    </g>
+    <g id="xmlsrv" class="package" transform="translate( 3575.099999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="65.1" height="139.03" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="138.03">XML Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="xmlsecurityengine" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="65.1" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="115.00000000000001">XML Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="xmlsrv_plat" transform="translate(0 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
+      <g id="xmlsecurityengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">XML Security Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3372,7 +4674,7 @@
         </g>
        </g>
       </g>
-      <g id="xml" transform="translate(0 37.6)" class="collection">
+      <g id="xml" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">XML</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3413,7 +4715,7 @@
         </g>
        </g>
       </g>
-      <g id="xmlsrv_info" transform="translate(0 18.8)" class="collection">
+      <g id="xmlsrv_info" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">XML Services Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3425,17 +4727,12 @@
         </g>
        </g>
       </g>
-      <g id="xmlsrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">xmlsrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 1451.7 0)">
+     </g>
+    </g>
+    <g id="deviceplatformrelease" class="package" transform="translate( 3642.299999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="51" height="139.03" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="51" x="25.5" y="138.03">Dev­ice Platform Release</text>
+     <rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000001">Dev­ice Platform Release</text>
      <g transform="translate(0 3.2)">
       <g id="locfiles" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -3532,12 +4829,12 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 1504.8 0)">
+    <g id="osrndtools" class="package" transform="translate( 3695.3999999999987 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="140.7" height="139.03" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="140.7" x="70.35" y="138.03">OS R&amp;D tools</text>
-     <g transform="translate(0 3.2)">
-      <g id="stif" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="140.7" height="116.00000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="140.7" x="70.35" y="115.00000000000001">OS R&amp;D tools</text>
+     <g transform="translate(0 3.2)">
+      <g id="stif" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="120.89999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="119.49999999999997" height="6.299999999999999">STIF</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3621,7 +4918,7 @@
         </g>
        </g>
       </g>
-      <g id="memspy" transform="translate(0 18.8)" class="collection">
+      <g id="memspy" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Memspy</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3656,7 +4953,7 @@
         </g>
        </g>
       </g>
-      <g id="hti" transform="translate(48.6 18.8)" class="collection">
+      <g id="hti" transform="translate(48.6 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Harmonized Test Inter­face</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3708,7 +5005,7 @@
         </g>
        </g>
       </g>
-      <g id="osrndtools_info" transform="translate(125.1 18.8)" class="collection">
+      <g id="osrndtools_info" transform="translate(125.1 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">OS R&amp;D tools Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3720,33 +5017,200 @@
         </g>
        </g>
       </g>
-      <g id="osrndtools_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">osrndtools_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
    </g>
   </g>
  </g>
- <g id="mw" transform="translate(3.1999999999999993 215.66)" class="layer">
-  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="260.40000000000003"/>
-  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="260.40000000000003" height="9.3" x="-130.50000000000003">Middleware</text>
-  <g class="layer-detail" transform="translate(51.649999999999906 3.2)">
-   <rect x="-38.84999999999991" class="layer" y="-3.2" width="2009.1" height="260.40000000000003"/>
+ <g id="mw" transform="translate(3.1999999999999993 192.63)" class="layer">
+  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
+  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
+  <g class="layer-detail" transform="translate(12.8 3.2)">
+   <rect x="0" class="layer" y="-3.2" width="4844.4" height="222.8"/>
    <g>
-    <g id="appsupport" class="package" transform="translate( 0 119.20000000000002)">
+    <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="150.89999999999998" height="134.8" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="117.59999999999998" x="92.1" y="11" dy="0.375em">Generic App Support</text>
-     <g transform="translate(0 3.2)">
-      <g id="contextframework" transform="translate(0 75.2)" class="collection placeholder">
+     <rect class="package" x="0" width="355.80000000000024" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="301.80000000000024" x="204.90000000000012" y="29.8" dy="0.375em">Generic App Support</text>
+     <g transform="translate(0 3.2)">
+      <g id="appsupport_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Generic App Support Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="flash_viewer_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Flash Viewer Framework API</text>
+        </g>
+        <g id="network_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Network Status API</text>
+        </g>
+       </g>
+      </g>
+      <g id="appsupport_plat" transform="translate(20.700000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="279.00000000000017"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="277.6000000000002" height="6.299999999999999">Generic App Support Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="action_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Action Plug-In API</text>
+        </g>
+        <g id="application_orientation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Application Orientation API</text>
+        </g>
+        <g id="context_access_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Context Access API</text>
+        </g>
+        <g id="context_framework_services_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Context Framework Services API</text>
+        </g>
+        <g id="context_framework_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Context Framework Client API</text>
+        </g>
+        <g id="context_framework_listener_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Context Framework Listener API</text>
+        </g>
+        <g id="context_framework_version_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Context Framework Version API</text>
+        </g>
+        <g id="context_source_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Context Source Plug-In API</text>
+        </g>
+        <g id="context_source_settings_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Context Source Settings Manager API</text>
+        </g>
+        <g id="context_subscription_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Context Subscription API</text>
+        </g>
+        <g id="key_event_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Key Event Framework API</text>
+        </g>
+        <g id="key_event_framework_mapper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Key Event Framework Mapper API</text>
+        </g>
+        <g id="media_keys_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Media Keys Definition API</text>
+        </g>
+        <g id="ood_threshold_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">OOD Threshold API</text>
+        </g>
+        <g id="oom_monitor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">OOM Monitor API</text>
+        </g>
+        <g id="oom_monitor_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">OOM Monitor Plugin API</text>
+        </g>
+        <g id="operation_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Operation Provider API</text>
+        </g>
+        <g id="phonecmdhandler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Phone Command Handler API</text>
+        </g>
+        <g id="restore_factory_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Restore Factory Settings API</text>
+        </g>
+        <g id="restore_factory_settings_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Restore Factory Settings Plug-in API</text>
+        </g>
+        <g id="secondary_display_accfw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Secondary Display Accessory Framework API</text>
+        </g>
+        <g id="secondary_display_startup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Secondary Display Startup API</text>
+        </g>
+        <g id="secondary_display_sysap_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Secondary Display System Application API</text>
+        </g>
+        <g id="secondary_display_system_state_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Secondary Display System State API</text>
+        </g>
+        <g id="sensor_user_setting_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Sensor User Setting API</text>
+        </g>
+        <g id="startup_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Startup Configuration API</text>
+        </g>
+        <g id="system_application_key_handler_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">System Application Key Handler Plug-in API</text>
+        </g>
+        <g id="system_application_light_control_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">System Application Light Control Plug-in API</text>
+        </g>
+        <g id="system_application_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">System Application Notification API</text>
+        </g>
+        <g id="system_application_plugin_callback_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">System Application Plug-in Callback API</text>
+        </g>
+       </g>
+      </g>
+      <g id="contextframework" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Context Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="coreapplicationuis" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="coreapplicationuis" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="120.89999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="119.49999999999997" height="6.299999999999999">Core App UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3817,17 +5281,17 @@
         </g>
        </g>
       </g>
-      <g id="flashliteapi_3_1" transform="translate(0 18.8)" class="collection placeholder">
+      <g id="flashliteapi_3_1" transform="translate(301.8000000000002 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Flash Lite API 3.1</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mediakeys" transform="translate(0 94)" class="collection placeholder">
+      <g id="mediakeys" transform="translate(0 75.2)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Media Keys</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="startupservices" transform="translate(0 112.80000000000001)" class="collection">
+      <g id="startupservices" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Startup Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3848,7 +5312,7 @@
         </g>
        </g>
       </g>
-      <g id="sysresmonitoring" transform="translate(30.000000000000004 112.80000000000001)" class="collection">
+      <g id="sysresmonitoring" transform="translate(30.000000000000004 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">System Resource Monitor­ing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3864,7 +5328,7 @@
         </g>
        </g>
       </g>
-      <g id="systemsettings" transform="translate(50.7 112.80000000000001)" class="collection">
+      <g id="systemsettings" transform="translate(50.7 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">System Settings</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3880,7 +5344,7 @@
         </g>
        </g>
       </g>
-      <g id="filehandling" transform="translate(122.99999999999997 56.400000000000006)" class="collection">
+      <g id="filehandling" transform="translate(122.99999999999997 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">File Handling</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3901,7 +5365,7 @@
         </g>
        </g>
       </g>
-      <g id="hwresourceadaptation" transform="translate(0 37.6)" class="collection">
+      <g id="hwresourceadaptation" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Hardware Resource Adapt.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3912,7 +5376,7 @@
         </g>
        </g>
       </g>
-      <g id="commonappservices" transform="translate(17.7 75.2)" class="collection">
+      <g id="commonappservices" transform="translate(17.7 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Common App Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3940,9 +5404,9 @@
         </g>
        </g>
       </g>
-      <g id="tzservices" transform="translate(17.7 94)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Time Zone Services</text>
+      <g id="tzservices" transform="translate(17.7 75.2)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Time Zone Services</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="tzserver" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -3959,9 +5423,14 @@
          <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Time Zone Localiz­ation Resource Factory</text>
         </g>
-       </g>
-      </g>
-      <g id="contenthandling" transform="translate(47.7 94)" class="collection">
+        <g id="tzdatabase" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Time Zone Database</text>
+        </g>
+       </g>
+      </g>
+      <g id="contenthandling" transform="translate(57.00000000000001 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Content Handling</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3972,7 +5441,7 @@
         </g>
        </g>
       </g>
-      <g id="openenvutils" transform="translate(17.7 18.8)" class="collection">
+      <g id="openenvutils" transform="translate(319.5000000000002 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Open Env. Utilities</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3990,7 +5459,7 @@
         </g>
        </g>
       </g>
-      <g id="printingsupport" transform="translate(17.7 37.6)" class="collection">
+      <g id="printingsupport" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Printing Support</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4001,7 +5470,7 @@
         </g>
        </g>
       </g>
-      <g id="appfw" transform="translate(57.00000000000001 75.2)" class="collection">
+      <g id="appfw" transform="translate(57.00000000000001 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">App Frame­work</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4017,7 +5486,7 @@
         </g>
        </g>
       </g>
-      <g id="applaunchservices" transform="translate(35.4 37.6)" class="collection">
+      <g id="applaunchservices" transform="translate(35.4 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">App Launch Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4033,7 +5502,7 @@
         </g>
        </g>
       </g>
-      <g id="tzpcside" transform="translate(65.4 94)" class="collection">
+      <g id="tzpcside" transform="translate(74.7 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Time Zone PC Side</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4044,7 +5513,7 @@
         </g>
        </g>
       </g>
-      <g id="appsupport_info" transform="translate(38.400000000000006 18.8)" class="collection">
+      <g id="appsupport_info" transform="translate(340.2000000000002 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Generic App Support Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4056,29 +5525,115 @@
         </g>
        </g>
       </g>
-      <g id="appsupport_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">appsupport_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="appsupport_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">appsupport_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="securitysrv" class="package" transform="translate( 152.99999999999997 119.20000000000002)">
+     </g>
+    </g>
+    <g id="securitysrv" class="package" transform="translate( 357.90000000000026 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="101.39999999999998" height="134.8" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="133.8">Security Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="cms" transform="translate(0 56.400000000000006)" class="collection placeholder">
+     <rect class="package" x="0" width="252.3" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="252.3" x="126.15" y="115.00000000000003">Security Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="secsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="167.40000000000003"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="166.00000000000003" height="6.299999999999999">Security Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="cms_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">CMS API</text>
+        </g>
+        <g id="pkcs12_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">PKCS12 Parser API</text>
+        </g>
+        <g id="java_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Java Utils API</text>
+        </g>
+        <g id="wim_cert_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">WIM Cert API</text>
+        </g>
+        <g id="device_key_store_encryption_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Device Key Store Encryption Plug-in API</text>
+        </g>
+        <g id="x509certnameparser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">X.509 Certificate Name Parser API</text>
+        </g>
+        <g id="remote_lock_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Remote Lock API</text>
+        </g>
+        <g id="pkidialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">PKI Dialog API</text>
+        </g>
+        <g id="provisioning_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Provisioning API</text>
+        </g>
+        <g id="keyguard_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Keyguard Configuration API</text>
+        </g>
+        <g id="keylock_policy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Keylock Policy API</text>
+        </g>
+        <g id="security_code_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Security Code UI API</text>
+        </g>
+        <g id="gba_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">GBA API</text>
+        </g>
+        <g id="keyguard_access_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Keyguard Access API</text>
+        </g>
+        <g id="devicelock_access_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Device Lock Access API</text>
+        </g>
+        <g id="lockapp_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Lock Application Server API</text>
+        </g>
+        <g id="devencadaptation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Device Encryption Adaptation API</text>
+        </g>
+        <g id="devenccommonutils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Device Encryption Common Utils API</text>
+        </g>
+       </g>
+      </g>
+      <g id="cms" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Certificate Management Service</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="pkiutilities" transform="translate(0 94)" class="collection">
+      <g id="pkiutilities" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">PKI Utilities</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4129,17 +5684,17 @@
         </g>
        </g>
       </g>
-      <g id="wim" transform="translate(0 75.2)" class="collection placeholder">
+      <g id="wim" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Wireless Identity Module</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="remotelock" transform="translate(0 37.6)" class="collection placeholder">
+      <g id="remotelock" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Remote Lock</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="securitydialogs" transform="translate(0 18.8)" class="collection">
+      <g id="securitydialogs" transform="translate(169.50000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Security Dialogs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4180,12 +5735,12 @@
         </g>
        </g>
       </g>
-      <g id="boottimeintegritycheck" transform="translate(85.79999999999998 94)" class="collection placeholder">
+      <g id="boottimeintegritycheck" transform="translate(85.79999999999998 75.2)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Boot Time Integrity Check</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="gba" transform="translate(17.7 56.400000000000006)" class="collection">
+      <g id="gba" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Generic Bootstrapping App. Arch.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4211,7 +5766,7 @@
         </g>
        </g>
       </g>
-      <g id="devencdiskutils" transform="translate(57.00000000000001 56.400000000000006)" class="collection">
+      <g id="devencdiskutils" transform="translate(57.00000000000001 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Device Encryption Disk Utils</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4237,7 +5792,7 @@
         </g>
        </g>
       </g>
-      <g id="securitysrv_info" transform="translate(67.19999999999999 18.8)" class="collection">
+      <g id="securitysrv_info" transform="translate(236.70000000000002 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Security Services Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4249,19 +5804,111 @@
         </g>
        </g>
       </g>
-      <g id="secsrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">secsrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="drm" class="package" transform="translate( 256.49999999999994 119.20000000000002)">
+     </g>
+    </g>
+    <g id="drm" class="package" transform="translate( 612.3000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="134.8" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="133.8">DRM</text>
-     <g transform="translate(0 3.2)">
-      <g id="commondrm" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="160.2" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="160.2" x="80.1" y="115.00000000000003">DRM</text>
+     <g transform="translate(0 3.2)">
+      <g id="drm_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">DRM Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="roap_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">ROAP API</text>
+        </g>
+        <g id="drm_common_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">DRM Common API</text>
+        </g>
+        <g id="drm_rights_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">DRM Rights API</text>
+        </g>
+        <g id="drm_legacy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">DRM Legacy API</text>
+        </g>
+        <g id="dcf_repository_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">DCF Repository API</text>
+        </g>
+        <g id="drm_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">DRM Service API</text>
+        </g>
+        <g id="drm_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">DRM Secondary Display API</text>
+        </g>
+        <g id="drm_license_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">DRM License Manager API</text>
+        </g>
+        <g id="drm_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">DRM Utility API</text>
+        </g>
+        <g id="drm_agents_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">DRM Agents API</text>
+        </g>
+        <g id="wmdrm_core_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">WM DRM Core API</text>
+        </g>
+        <g id="wmdrm_access_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">WMDRM Access API</text>
+        </g>
+        <g id="camese_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Camese Utility API</text>
+        </g>
+        <g id="camese_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Camese Framework API</text>
+        </g>
+       </g>
+      </g>
+      <g id="drm_pub" transform="translate(132.29999999999998 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">DRM Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="drm_helper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">DRM Helper API</text>
+        </g>
+        <g id="oma_drm_caf_agent_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">OMA DRM CAF Agent API</text>
+        </g>
+        <g id="drm_license_checker_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">DRM License Checker API</text>
+        </g>
+       </g>
+      </g>
+      <g id="commondrm" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Common DRM</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4282,7 +5929,7 @@
         </g>
        </g>
       </g>
-      <g id="omadrm" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="omadrm" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">OMA DRM</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4293,29 +5940,171 @@
         </g>
        </g>
       </g>
-      <g id="wmdrm" transform="translate(0 75.2)" class="collection placeholder">
+      <g id="wmdrm" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Windows Media DRM</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="drm_pub" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">drm_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="drm_plat" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">drm_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
     <g id="locationsrv" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="119.99999999999997" height="116.00000000000001" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="119.99999999999997" x="59.999999999999986" y="115.00000000000001">Location Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="genericpositioningplugins" transform="translate(0 75.2)" class="collection">
+     <rect class="package" x="0" width="280.2000000000001" height="97.2" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="280.2000000000001" x="140.10000000000005" y="96.2">Location Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="locsrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Location Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="landmarks_search_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Landmarks Search API</text>
+        </g>
+        <g id="landmarks_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Landmarks API</text>
+        </g>
+        <g id="landmarks_database_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Landmarks Database Management API</text>
+        </g>
+        <g id="location_triggering_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Location Triggering API</text>
+        </g>
+        <g id="blid_application_satellite_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">BLID Application Satellite Info API</text>
+        </g>
+       </g>
+      </g>
+      <g id="locsrv_plat" transform="translate(48.6 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="213.9000000000001"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="212.50000000000009" height="6.299999999999999">Location Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="map_and_navigation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Map and Navigation API</text>
+        </g>
+        <g id="map_and_navigation_provider_discovery_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Map and Navigation Provider Discovery API</text>
+        </g>
+        <g id="geocoding_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Geocoding API</text>
+        </g>
+        <g id="map_image_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Map Image API</text>
+        </g>
+        <g id="map_and_navigation_aiw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Map and Navigation AIW API</text>
+        </g>
+        <g id="map_and_navigation_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Map and Navigation Provider API</text>
+        </g>
+        <g id="landmarks_category_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Landmarks Category Definition API</text>
+        </g>
+        <g id="supl_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">SUPL Settings API</text>
+        </g>
+        <g id="location_settings_launch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Location Settings Launch API</text>
+        </g>
+        <g id="map_image_conversion_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Map Image Conversion Plug-In API</text>
+        </g>
+        <g id="psy_configuration_ui_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">PSY Configuration UI Plug-in API</text>
+        </g>
+        <g id="np_proxy_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">NP Proxy Configuration API</text>
+        </g>
+        <g id="supl_terminal_initiation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">SUPL Terminal Initiation API</text>
+        </g>
+        <g id="location_notation_preferences_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Location Notation Preferences Settings API</text>
+        </g>
+        <g id="supl_settings_notifier_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">SUPL Settings Notifier Secondary Display API</text>
+        </g>
+        <g id="supl_network_initiation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">SUPL Network Initiation API</text>
+        </g>
+        <g id="privacy_notifiers_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Privacy Notifiers Secondary Display API</text>
+        </g>
+        <g id="oma_supl_configuration_parameter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">OMA SUPL Configuration Parameter API</text>
+        </g>
+        <g id="supl_query_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">SUPL Query Secondary Display API</text>
+        </g>
+        <g id="location_triggering_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Location Triggering Management API</text>
+        </g>
+        <g id="location_triggering_status_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Location Triggering Status Information API</text>
+        </g>
+        <g id="oma_supl_asn_codec_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">OMA SUPL ASN Codec Plugin API</text>
+        </g>
+        <g id="location_local_variation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Location Local Variation API</text>
+        </g>
+       </g>
+      </g>
+      <g id="genericpositioningplugins" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Generic Positioning Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4331,7 +6120,7 @@
         </g>
        </g>
       </g>
-      <g id="landmarks" transform="translate(0 37.6)" class="collection">
+      <g id="landmarks" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Land­marks</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4342,7 +6131,7 @@
         </g>
        </g>
       </g>
-      <g id="locationmapnavfw" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="locationmapnavfw" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Location Map &amp; Nav Fmwk.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4358,7 +6147,7 @@
         </g>
        </g>
       </g>
-      <g id="locationsystemui" transform="translate(0 18.8)" class="collection">
+      <g id="locationsystemui" transform="translate(264.6000000000001 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location System UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4369,7 +6158,7 @@
         </g>
        </g>
       </g>
-      <g id="supl" transform="translate(20.700000000000003 56.400000000000006)" class="collection">
+      <g id="supl" transform="translate(20.700000000000003 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">SUPL</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4390,7 +6179,7 @@
         </g>
        </g>
       </g>
-      <g id="locationtriggering" transform="translate(17.7 37.6)" class="collection">
+      <g id="locationtriggering" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Location Trigger­ing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4451,24 +6240,90 @@
         </g>
        </g>
       </g>
-      <g id="locsrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">locsrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="locsrv_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">locsrv_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="accesssec" class="package" transform="translate( 291.9 119.20000000000002)">
+     </g>
+    </g>
+    <g id="accesssec" class="package" transform="translate( 774.6000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="46.5" height="134.8" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="46.5" x="23.25" y="133.8">Access Security</text>
-     <g transform="translate(0 3.2)">
-      <g id="wlansecuritysettings" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="178.79999999999998" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="178.79999999999998" x="89.39999999999999" y="115.00000000000003">Access Security</text>
+     <g transform="translate(0 3.2)">
+      <g id="accesssec_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">Access Security Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wapi_security_settings_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">WAPI Security Settings UI API</text>
+        </g>
+        <g id="wep_security_settings_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">WEP Security Settings UI API</text>
+        </g>
+        <g id="wi-fi_protected_setup_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Wi-Fi Protected Setup UI API</text>
+        </g>
+        <g id="wlan_eap_settings_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">WLAN EAP Settings UI API</text>
+        </g>
+        <g id="wpa_security_settings_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">WPA Security Settings UI API</text>
+        </g>
+        <g id="eap_vpn_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">EAP VPN API</text>
+        </g>
+        <g id="eapsim_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">EAP-SIM DB API</text>
+        </g>
+        <g id="eap_type_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">EAP Type API</text>
+        </g>
+        <g id="eaptlspeap_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">EAP-TLS-PEAP DB API</text>
+        </g>
+        <g id="eapleap_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">LEAP DB API</text>
+        </g>
+        <g id="eapgtc_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">EAP-GTC DB API</text>
+        </g>
+        <g id="eapmschapv2_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">EAP-MSCHAPV2 DB API</text>
+        </g>
+        <g id="eapaka_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">EAP-AKA DB API</text>
+        </g>
+        <g id="wapi_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">WAPI DB API</text>
+        </g>
+       </g>
+      </g>
+      <g id="wlansecuritysettings" transform="translate(132.29999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">WLAN Security Settings</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4499,7 +6354,7 @@
         </g>
        </g>
       </g>
-      <g id="eapol" transform="translate(0 75.2)" class="collection">
+      <g id="eapol" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">EAPOL</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4510,19 +6365,126 @@
         </g>
        </g>
       </g>
-      <g id="accesssec_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">accesssec_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="ipconnmgmt" class="package" transform="translate( 340.5 119.20000000000002)">
+     </g>
+    </g>
+    <g id="ipconnmgmt" class="package" transform="translate( 955.5000000000002 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="78.60000000000001" height="134.8" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="78.60000000000001" x="39.300000000000004" y="133.8">IP Connect­ivity Mgmt.</text>
-     <g transform="translate(0 3.2)">
-      <g id="accesspointcontrol" transform="translate(0 94)" class="collection">
+     <rect class="package" x="0" width="235.79999999999998" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="235.79999999999998" x="117.89999999999999" y="115.00000000000003">IP Connect­ivity Mgmt.</text>
+     <g transform="translate(0 3.2)">
+      <g id="ipcm_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="111.59999999999998"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="110.19999999999997" height="6.299999999999999">IP Connect­ivity Mgmt. Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="access_point_engine_misc_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Access Point Engine Misc API</text>
+        </g>
+        <g id="bearer_settings_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Bearer Settings Plugin API</text>
+        </g>
+        <g id="commsdat_wlan_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">CommsDat WLAN API</text>
+        </g>
+        <g id="connection_monitor_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Conn. Monitor Ext. API</text>
+        </g>
+        <g id="connection_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Connection UI Utilities API</text>
+        </g>
+        <g id="disconnect_dialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Disconnect Dialog API</text>
+        </g>
+        <g id="disconnect_dialog_disable_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Disconnect Dialog Disable API</text>
+        </g>
+        <g id="extended_connection_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Extended Connection Settings API</text>
+        </g>
+        <g id="mpm_default_connection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">MPM Default Connection API</text>
+        </g>
+        <g id="pdpcontextmanager2_reset_factory_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">PDP Context Manager 2 Reset Factory Settings API</text>
+        </g>
+        <g id="pdpcontextmanager2_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">PDP Context Manager 2 Settings API</text>
+        </g>
+        <g id="mpm_connect_screen_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">MPM Connect Screen API</text>
+        </g>
+       </g>
+      </g>
+      <g id="ipcm_pub" transform="translate(113.69999999999997 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">IP Connect­ivity Mgmt. Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="connection_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Connection Settings API</text>
+        </g>
+        <g id="access_point_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Access Point Engine API</text>
+        </g>
+        <g id="access_point_settings_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Access Point Settings Handler API</text>
+        </g>
+        <g id="data_connection_log_counters_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Data Connection Log Counters API</text>
+        </g>
+        <g id="connection_monitor_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Connection Monitor Server API</text>
+        </g>
+        <g id="connection_settings_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Connection Settings UI API</text>
+        </g>
+        <g id="agent_dialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Agent Dialog API</text>
+        </g>
+        <g id="extendedconnpref_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Extended Connection Preferences API</text>
+        </g>
+       </g>
+      </g>
+      <g id="accesspointcontrol" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Access Point Control</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4533,7 +6495,7 @@
         </g>
        </g>
       </g>
-      <g id="alwayson_net_plugin" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="alwayson_net_plugin" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Always Online Net Plugin</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4544,7 +6506,7 @@
         </g>
        </g>
       </g>
-      <g id="apengine" transform="translate(0 75.2)" class="collection">
+      <g id="apengine" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Access Point Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4565,7 +6527,7 @@
         </g>
        </g>
       </g>
-      <g id="bearermanagement" transform="translate(30.000000000000004 75.2)" class="collection">
+      <g id="bearermanagement" transform="translate(30.000000000000004 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Bearer Manage­ment</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4586,7 +6548,7 @@
         </g>
        </g>
       </g>
-      <g id="cmmanager" transform="translate(60.00000000000001 75.2)" class="collection">
+      <g id="cmmanager" transform="translate(60.00000000000001 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Conn. Method Manager</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4602,7 +6564,7 @@
         </g>
        </g>
       </g>
-      <g id="connectionmonitoring" transform="translate(17.7 56.400000000000006)" class="collection">
+      <g id="connectionmonitoring" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Connec­tion Monitor­ing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4628,7 +6590,7 @@
         </g>
        </g>
       </g>
-      <g id="connectionutilities" transform="translate(0 18.8)" class="collection">
+      <g id="connectionutilities" transform="translate(190.19999999999996 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Connec­tion Utilities</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4639,7 +6601,7 @@
         </g>
        </g>
       </g>
-      <g id="dbcreator" transform="translate(17.7 18.8)" class="collection">
+      <g id="dbcreator" transform="translate(207.89999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">DB Creator</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4660,24 +6622,35 @@
         </g>
        </g>
       </g>
-      <g id="ipcm_pub" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">ipcm_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="ipcm_plat" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">ipcm_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="netprotocols" class="package" transform="translate( 421.2 119.20000000000002)">
+     </g>
+    </g>
+    <g id="netprotocols" class="package" transform="translate( 1193.4 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="83.69999999999999" height="134.8" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="133.8">High-level Internet Protocols</text>
-     <g transform="translate(0 3.2)">
-      <g id="httpfilters" transform="translate(0 94)" class="collection">
+     <rect class="package" x="0" width="83.69999999999999" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="115.00000000000003">High-level Internet Protocols</text>
+     <g transform="translate(0 3.2)">
+      <g id="netprotocols_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">High-level Internet Protocols Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="cookie_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Cookie Manager API</text>
+        </g>
+        <g id="http_cache_mgr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HTTP Cache Manager API</text>
+        </g>
+        <g id="http_filters_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HTTP Filters API</text>
+        </g>
+       </g>
+      </g>
+      <g id="httpfilters" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">HTTP Filters</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4728,7 +6701,7 @@
         </g>
        </g>
       </g>
-      <g id="applayerprotocols" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="applayerprotocols" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">App Layer Protocols</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4770,7 +6743,7 @@
         </g>
        </g>
       </g>
-      <g id="applayerpluginsandutils" transform="translate(0 75.2)" class="collection">
+      <g id="applayerpluginsandutils" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">App Layer Plugins &amp; Utils</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4796,7 +6769,7 @@
         </g>
        </g>
       </g>
-      <g id="netprotocols_info" transform="translate(0 18.8)" class="collection">
+      <g id="netprotocols_info" transform="translate(30.000000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">High-level Internet Protocols Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4808,19 +6781,30 @@
         </g>
        </g>
       </g>
-      <g id="netprotocols_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">netprotocols_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="ipappprotocols" class="package" transform="translate( 507 119.20000000000002)">
+     </g>
+    </g>
+    <g id="ipappprotocols" class="package" transform="translate( 1279.2 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="46.5" height="134.8" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="46.5" x="23.25" y="133.8">IP App Protocols</text>
-     <g transform="translate(0 3.2)">
-      <g id="rtp" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="46.5" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="46.5" x="23.25" y="115.00000000000003">IP App Protocols</text>
+     <g transform="translate(0 3.2)">
+      <g id="ipappprotocols_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">IP App Protocols Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="srtp_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">SRTP API</text>
+        </g>
+        <g id="rtprtcp_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">RTP/RTCP API</text>
+        </g>
+       </g>
+      </g>
+      <g id="rtp" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">RTP</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4836,7 +6820,7 @@
         </g>
        </g>
       </g>
-      <g id="realtimenetprots" transform="translate(20.700000000000003 37.6)" class="collection">
+      <g id="realtimenetprots" transform="translate(20.700000000000003 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Real Time Net Protocols</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4852,7 +6836,7 @@
         </g>
        </g>
       </g>
-      <g id="sipplugins" transform="translate(0 75.2)" class="collection">
+      <g id="sipplugins" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">SIP Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4883,7 +6867,7 @@
         </g>
        </g>
       </g>
-      <g id="sipproviderplugins" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="sipproviderplugins" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SIP Provider Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4894,7 +6878,7 @@
         </g>
        </g>
       </g>
-      <g id="ipappprotocols_info" transform="translate(0 18.8)" class="collection">
+      <g id="ipappprotocols_info" transform="translate(20.700000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">IP App Protocols Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4906,24 +6890,45 @@
         </g>
        </g>
       </g>
-      <g id="ipappprotocols_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">ipappprotocols_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="wirelessacc" class="package" transform="translate( 122.09999999999997 0)">
+     </g>
+    </g>
+    <g id="wirelessacc" class="package" transform="translate( 282.3000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="37.2" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="37.2" x="18.6" y="115.00000000000001">Wireless Access</text>
-     <g transform="translate(0 3.2)">
-      <g id="hotspotfw" transform="translate(0 56.400000000000006)" class="collection placeholder">
+     <rect class="package" x="0" width="37.2" height="97.2" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="37.2" x="18.6" y="96.2">Wireless Access</text>
+     <g transform="translate(0 3.2)">
+      <g id="hsfw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">HotSpot FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="hotspot_framework_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HotSpot Framework Client API</text>
+        </g>
+        <g id="internet_connectivity_test_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Internet Connectivity Test Service API</text>
+        </g>
+        <g id="internet_connectivity_test_service_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Internet Connectivity Test Service Settings API</text>
+        </g>
+        <g id="hotspot_framework_client_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">HotSpot Framework Client Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="hotspotfw" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">HotSpot Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="wlanutilities" transform="translate(0 37.6)" class="collection">
+      <g id="wlanutilities" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">WLAN Utilities</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4949,19 +6954,25 @@
         </g>
        </g>
       </g>
-      <g id="hsfw_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">hsfw_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="vpnclient" class="package" transform="translate( 161.39999999999998 0)">
+     </g>
+    </g>
+    <g id="vpnclient" class="package" transform="translate( 321.60000000000014 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="260.40000000000015" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="260.40000000000015" x="130.20000000000007" y="115.00000000000001">VPN Client</text>
-     <g transform="translate(0 3.2)">
-      <g id="vpnapiimpl" transform="translate(0 18.8)" class="collection placeholder">
+     <rect class="package" x="0" width="260.40000000000015" height="97.2" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="260.40000000000015" x="130.20000000000007" y="96.2">VPN Client</text>
+     <g transform="translate(0 3.2)">
+      <g id="vpnc_plat" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">VPN Client Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="vpnapi" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">VPN API</text>
+        </g>
+       </g>
+      </g>
+      <g id="vpnapiimpl" transform="translate(17.7 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VPN API Impl.</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -5148,40 +7159,65 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">help</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="vpnc_plat" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">vpnc_plat</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="vpnapi" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">vpnapi</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="ipappsrv" class="package" transform="translate( 423.9000000000002 0)">
+     </g>
+    </g>
+    <g id="ipappsrv" class="package" transform="translate( 584.1000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="54.900000000000006" height="116.00000000000001" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="54.900000000000006" x="27.450000000000003" y="67.4" dy="0.375em">IP App Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="natfw" transform="translate(0 94)" class="collection placeholder">
+     <rect class="package" x="0" width="112.8" height="97.2" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="112.8" x="56.4" y="48.6" dy="0.375em">IP App Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="ipappsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">IP App Services Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="transcoder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Transcoder API</text>
+        </g>
+        <g id="comms_event_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Comms Event API</text>
+        </g>
+        <g id="floor_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Floor Control API</text>
+        </g>
+        <g id="media_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Media Control API</text>
+        </g>
+        <g id="multimedia_comms_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Multimedia Comms API</text>
+        </g>
+        <g id="nat_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">NAT Settings API</text>
+        </g>
+       </g>
+      </g>
+      <g id="natfw" transform="translate(0 75.2)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">NAT Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="multimediacommscontroller" transform="translate(0 37.6)" class="collection placeholder">
+      <g id="multimediacommscontroller" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">MM Comms Contrllr.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="multimediacommsengine" transform="translate(0 75.2)" class="collection placeholder">
+      <g id="multimediacommsengine" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Multi­media Comms Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="natplugins" transform="translate(0 18.8)" class="collection">
+      <g id="natplugins" transform="translate(57.9 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">NAT Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5207,7 +7243,7 @@
         </g>
        </g>
       </g>
-      <g id="ipappsrv_info" transform="translate(39.300000000000004 18.8)" class="collection">
+      <g id="ipappsrv_info" transform="translate(97.2 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">IP App Services Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5219,19 +7255,210 @@
         </g>
        </g>
       </g>
-      <g id="ipappsrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">ipappsrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="phonesrv" class="package" transform="translate( 480.9000000000002 0)">
+     </g>
+    </g>
+    <g id="phonesrv" class="package" transform="translate( 699.0000000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="95.1" height="116.00000000000001" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="61.8" x="64.19999999999999" y="11" dy="0.375em">Telephony &amp; SIM Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="telutils" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="391.8000000000003" height="97.2" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="355.5000000000003" x="214.05000000000015" y="86.2" dy="0.375em">Telephony &amp; SIM Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="phonesrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="353.40000000000026"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="352.0000000000003" height="6.299999999999999">Telephony &amp; SIM Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="string_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">String Parser API</text>
+        </g>
+        <g id="cbs_mcn_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">CBS MCN Client API</text>
+        </g>
+        <g id="converged_call_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Converged Call Engine API</text>
+        </g>
+        <g id="aiw_dial_data_consumer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">AIW Dial Data Consumer API</text>
+        </g>
+        <g id="phone_client_ussd_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Phone Client USSD API</text>
+        </g>
+        <g id="sat_refresh_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">SAT Refresh API</text>
+        </g>
+        <g id="network_handling_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Network Handling Engine API</text>
+        </g>
+        <g id="phone_client_emergency_call_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Phone Client Emergency Call API</text>
+        </g>
+        <g id="sat_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">SAT Configuration API</text>
+        </g>
+        <g id="dial_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Dial Utils API</text>
+        </g>
+        <g id="phone_client_image_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Phone Client Image Handler API</text>
+        </g>
+        <g id="phone_client_messenger_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Phone Client Messenger API</text>
+        </g>
+        <g id="sat_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">SAT Client API</text>
+        </g>
+        <g id="phone_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Phone Client API</text>
+        </g>
+        <g id="sat_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">SAT Service API</text>
+        </g>
+        <g id="cbs_message_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">CBS Message API</text>
+        </g>
+        <g id="phone_client_server_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Phone Client Server Information API</text>
+        </g>
+        <g id="phone_client_ussd_internal_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Phone Client USSD Internal API</text>
+        </g>
+        <g id="phone_client_command_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Phone Client Command Handler API</text>
+        </g>
+        <g id="phone_client_notify_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Phone Client Notify API</text>
+        </g>
+        <g id="phone_client_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Phone Client Utility API</text>
+        </g>
+        <g id="telephony_network_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Telephony Network Information API</text>
+        </g>
+        <g id="secondary_display_sat_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Secondary Display SAT API</text>
+        </g>
+        <g id="callui_reconnect_query_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">CallUI Reconnect Query API</text>
+        </g>
+        <g id="service_provider_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Service Provider Settings API</text>
+        </g>
+        <g id="converged_call_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Converged Call Provider API</text>
+        </g>
+        <g id="incoming_call_monitor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Incoming Call Monitor API</text>
+        </g>
+        <g id="default_emergency_numbers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Default Emergency Numbers API</text>
+        </g>
+        <g id="cenrep_database_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Central Repository Database API</text>
+        </g>
+        <g id="ss_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">SS Settings API</text>
+        </g>
+        <g id="phone_settings_observer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Phone Settings Observer API</text>
+        </g>
+        <g id="phone_settings_notes_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Phone Settings Notes UI API</text>
+        </g>
+        <g id="phone_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">Phone Settings API</text>
+        </g>
+        <g id="voice_mailbox_number_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Voice Mailbox Number API</text>
+        </g>
+        <g id="voice_mailbox_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Voice Mailbox Settings API</text>
+        </g>
+        <g id="call_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">Call Information API</text>
+        </g>
+        <g id="call_remote_party_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">Call Remote Party Information API</text>
+        </g>
+        <g id="telephony_mediator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Telephony Mediator API</text>
+        </g>
+       </g>
+      </g>
+      <g id="telutils" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Telephony Utils</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5247,7 +7474,7 @@
         </g>
        </g>
       </g>
-      <g id="cbs" transform="translate(0 94)" class="collection">
+      <g id="cbs" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Cellular Baseband Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5263,7 +7490,7 @@
         </g>
        </g>
       </g>
-      <g id="cellular" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="cellular" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Cellular</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5289,7 +7516,7 @@
         </g>
        </g>
       </g>
-      <g id="convergedcallengine" transform="translate(0 75.2)" class="collection">
+      <g id="convergedcallengine" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Con­verged Call Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5325,7 +7552,7 @@
         </g>
        </g>
       </g>
-      <g id="engines" transform="translate(0 18.8)" class="collection">
+      <g id="engines" transform="translate(355.5000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Telephony Engines</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5336,7 +7563,7 @@
         </g>
        </g>
       </g>
-      <g id="networkhandling" transform="translate(20.700000000000003 94)" class="collection">
+      <g id="networkhandling" transform="translate(20.700000000000003 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Network Handling</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5347,7 +7574,7 @@
         </g>
        </g>
       </g>
-      <g id="phoneclientserver" transform="translate(39.300000000000004 56.400000000000006)" class="collection">
+      <g id="phoneclientserver" transform="translate(39.300000000000004 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Phone Client/Server</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5383,7 +7610,7 @@
         </g>
        </g>
       </g>
-      <g id="satengine" transform="translate(20.700000000000003 37.6)" class="collection">
+      <g id="satengine" transform="translate(20.700000000000003 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SIM Application Toolkit Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5394,7 +7621,7 @@
         </g>
        </g>
       </g>
-      <g id="satui" transform="translate(17.7 18.8)" class="collection">
+      <g id="satui" transform="translate(373.2000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">SIM App Toolkit UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5410,7 +7637,7 @@
         </g>
        </g>
       </g>
-      <g id="phonecmdhandler" transform="translate(38.400000000000006 37.6)" class="collection">
+      <g id="phonecmdhandler" transform="translate(38.400000000000006 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Phone Command Handler</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5421,29 +7648,61 @@
         </g>
        </g>
       </g>
-      <g id="phonesrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">phonesrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="phonesrv_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">phonesrv_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="messagingmw" class="package" transform="translate( 578.1000000000003 0)">
+     </g>
+    </g>
+    <g id="messagingmw" class="package" transform="translate( 1092.9000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="147.89999999999998" height="116.00000000000001" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="147.89999999999998" x="73.94999999999999" y="115.00000000000001">Messag­ing Middle­ware</text>
-     <g transform="translate(0 3.2)">
-      <g id="msgbranched" transform="translate(0 37.6)" class="collection placeholder">
+     <rect class="package" x="0" width="147.89999999999998" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="147.89999999999998" x="73.94999999999999" y="96.2">Messag­ing Middle­ware</text>
+     <g transform="translate(0 3.2)">
+      <g id="msgfw_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Msg. Middle­ware Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="send_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Send UI API</text>
+        </g>
+       </g>
+      </g>
+      <g id="msgfw_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Msg. Middle­ware Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="always_online_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Always Online Plugin API</text>
+        </g>
+        <g id="always_online_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Always Online Client API</text>
+        </g>
+        <g id="msg_common_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Messaging Common Utils API</text>
+        </g>
+        <g id="send_ui_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Send UI Plug-in API</text>
+        </g>
+        <g id="send_ui_datautils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Send UI Data Utils API</text>
+        </g>
+       </g>
+      </g>
+      <g id="msgbranched" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Messag­ing Branched</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="messagingfw" transform="translate(17.7 37.6)" class="collection">
+      <g id="messagingfw" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">Messag­ing Frame­work</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5521,7 +7780,7 @@
         </g>
        </g>
       </g>
-      <g id="messagingmw_info" transform="translate(0 18.8)" class="collection">
+      <g id="messagingmw_info" transform="translate(66.3 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Msg. Middle­ware Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5533,29 +7792,155 @@
         </g>
        </g>
       </g>
-      <g id="msgfw_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">msgfw_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="msgfw_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">msgfw_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="imsrv" class="package" transform="translate( 728.1000000000003 0)">
+     </g>
+    </g>
+    <g id="imsrv" class="package" transform="translate( 1242.9000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="55.8" height="116.00000000000001" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="105" dy="0.375em">Instant Msg. &amp; Presence Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="ximpfw" transform="translate(0 75.2)" class="collection placeholder">
+     <rect class="package" x="0" width="259.50000000000017" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="259.50000000000017" x="129.75000000000009" y="86.2" dy="0.375em">Instant Msg. &amp; Presence Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="imsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="241.80000000000013"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="240.40000000000012" height="6.299999999999999">Instant Msg. &amp; Presence Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="ximp_core_data_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">XIMP Core Data Model API</text>
+        </g>
+        <g id="ximp_presence_protocol_plugin_host_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">XIMP Presence Protocol Plug-in Host API</text>
+        </g>
+        <g id="ximp_presence_data_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">XIMP Presence Data Model API</text>
+        </g>
+        <g id="ximp_presence_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">XIMP Presence Protocol Plug-in API</text>
+        </g>
+        <g id="ximp_presence_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">XIMP Presence Management API</text>
+        </g>
+        <g id="ximp_core_protocol_plugin_host_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">XIMP Core Protocol Plug-in Host API</text>
+        </g>
+        <g id="ximp_core_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">XIMP Core Management API</text>
+        </g>
+        <g id="ximp_presence_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">XIMP Presence Base API</text>
+        </g>
+        <g id="ximp_core_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">XIMP Core Protocol Plug-in API</text>
+        </g>
+        <g id="ximp_core_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">XIMP Core Base API</text>
+        </g>
+        <g id="ximp_presence_cache_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">XIMP Presence Cache API</text>
+        </g>
+        <g id="ximp_core_feature_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">XIMP Core Feature Plugin API</text>
+        </g>
+        <g id="ximp_im_protocol_plugin_host_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">XIMP IM Protocol Plugin Host API</text>
+        </g>
+        <g id="ximp_im_data_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">XIMP IM Data Model API</text>
+        </g>
+        <g id="ximp_im_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">XIMP IM Protocol Plugin API</text>
+        </g>
+        <g id="ximp_im_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">XIMP IM Management API</text>
+        </g>
+        <g id="ximp_im_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">XIMP IM Base API</text>
+        </g>
+        <g id="ximp_search_protocol_plugin_host_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">XIMP Search Protocol Plugin Host API</text>
+        </g>
+        <g id="ximp_search_data_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">XIMP Search Data Model API</text>
+        </g>
+        <g id="ximp_search_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">XIMP search Protocol Plugin API</text>
+        </g>
+        <g id="ximp_search_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">XIMP Search Management API</text>
+        </g>
+        <g id="ximp_search_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">XIMP Search Base API</text>
+        </g>
+        <g id="xmpp_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">XMPP Settings API</text>
+        </g>
+        <g id="im_cache_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">IM Cache Client API</text>
+        </g>
+        <g id="im_cache_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">IM Cache Server API</text>
+        </g>
+        <g id="presence_avabilitytext" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Presence Avability Text</text>
+        </g>
+       </g>
+      </g>
+      <g id="ximpfw" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XIMP Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imservices" transform="translate(0 37.6)" class="collection">
+      <g id="imservices" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">IM Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5591,91 +7976,163 @@
         </g>
        </g>
       </g>
-      <g id="brandingserver" transform="translate(0 18.8)" class="collection placeholder">
+      <g id="brandingserver" transform="translate(243.90000000000012 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Branding Server</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imsrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">imsrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="legacypresence" class="package" transform="translate( 786.0000000000002 0)">
+     </g>
+    </g>
+    <g id="legacypresence" class="package" transform="translate( 1504.5000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="115.00000000000001">Legacy Presence Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="xdmengine" transform="translate(0 56.400000000000006)" class="collection placeholder">
+     <rect class="package" x="0" width="156.29999999999995" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="156.29999999999995" x="78.14999999999998" y="96.2">Legacy Presence Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="pressrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="120.89999999999998"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="119.49999999999997" height="6.299999999999999">Legacy Presence Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="presence_list_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Presence List API</text>
+        </g>
+        <g id="watcher_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Watcher Info API</text>
+        </g>
+        <g id="simple_documents_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SIMPLE Documents API</text>
+        </g>
+        <g id="authorization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Authorization API</text>
+        </g>
+        <g id="xdm_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">XDM Protocol Plug-in API</text>
+        </g>
+        <g id="watcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Watcher API</text>
+        </g>
+        <g id="xdm_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">XDM API</text>
+        </g>
+        <g id="registration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Registration API</text>
+        </g>
+        <g id="publisher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Publisher API</text>
+        </g>
+        <g id="messaging_connection_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Messaging Connection Manager API</text>
+        </g>
+        <g id="xdm_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">XDM Settings API</text>
+        </g>
+        <g id="simple_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">SIMPLE Settings API</text>
+        </g>
+        <g id="simple_instant_msg_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Simple Instant Msg API</text>
+        </g>
+       </g>
+      </g>
+      <g id="xdmengine" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XDM Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="xdmsettingsui" transform="translate(0 18.8)" class="collection placeholder">
+      <g id="xdmsettingsui" transform="translate(122.99999999999997 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XDM Settings UI</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="xdmprotocols" transform="translate(0 37.6)" class="collection placeholder">
+      <g id="xdmprotocols" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XDM Protocols</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="msgconnmanager" transform="translate(17.7 37.6)" class="collection placeholder">
+      <g id="msgconnmanager" transform="translate(17.7 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Msg. Conn. Manager</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="presencesettingsui" transform="translate(17.7 18.8)" class="collection placeholder">
+      <g id="presencesettingsui" transform="translate(140.69999999999996 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Presence Settings UI</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="simpleengine" transform="translate(17.7 56.400000000000006)" class="collection placeholder">
+      <g id="simpleengine" transform="translate(17.7 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIMPLE Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="presencefwsimpleadpt" transform="translate(35.4 37.6)" class="collection placeholder">
+      <g id="presencefwsimpleadpt" transform="translate(35.4 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Presence FW SIMPLE Adapt.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="simpledatamodeladapter" transform="translate(53.099999999999994 37.6)" class="collection placeholder">
+      <g id="simpledatamodeladapter" transform="translate(53.099999999999994 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIMPLE Data Model Adapter</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="pressrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">pressrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="opensrv" class="package" transform="translate( 856.8000000000002 0)">
+     </g>
+    </g>
+    <g id="opensrv" class="package" transform="translate( 1662.9000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000001">Open Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="loudmouth" transform="translate(0 75.2)" class="collection placeholder">
+     <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Open Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="opensrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Open Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="messagequeue_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Message Queue API</text>
+        </g>
+       </g>
+      </g>
+      <g id="loudmouth" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Loud­mouth</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="libtelepathy" transform="translate(0 56.400000000000006)" class="collection placeholder">
+      <g id="libtelepathy" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telepathy Library</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="telepathygabble" transform="translate(0 18.8)" class="collection placeholder">
+      <g id="telepathygabble" transform="translate(17.7 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telepathy Gabble</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="isolationserver" transform="translate(0 37.6)" class="collection">
+      <g id="isolationserver" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Isolation Server</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5691,19 +8148,221 @@
         </g>
        </g>
       </g>
-      <g id="opensrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">opensrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="remotemgmt" class="package" transform="translate( 886.8000000000002 0)">
+     </g>
+    </g>
+    <g id="remotemgmt" class="package" transform="translate( 1698.3000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
-     <rect class="package" x="0" width="57.900000000000006" height="116.00000000000001" y="0" style="fill:darkseagreen;"/>
-     <text text-anchor="middle" class="package" width="57.900000000000006" x="28.950000000000003" y="105" dy="0.375em">Remote Manage­ment</text>
-     <g transform="translate(0 3.2)">
-      <g id="policymanagement" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="431.1000000000003" height="97.2" y="0" style="fill:darkseagreen;"/>
+     <text text-anchor="middle" class="package" width="431.1000000000003" x="215.55000000000015" y="86.2" dy="0.375em">Remote Manage­ment</text>
+     <g transform="translate(0 3.2)">
+      <g id="remotemgmt_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Remote Mgmt. Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="synchronization_capability_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Synchronization Capability API</text>
+        </g>
+       </g>
+      </g>
+      <g id="remotemgmt_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="353.40000000000026"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="352.0000000000003" height="6.299999999999999">Remote Mgmt. Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="common_agent_util_and_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Common Agent util and definitions API</text>
+        </g>
+        <g id="policy_management_certificate_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Policy Management Certificate API</text>
+        </g>
+        <g id="oma_provisioning_adapter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">OMA Provisioning Adapter API</text>
+        </g>
+        <g id="device_management_parameter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Device Management Parameter API</text>
+        </g>
+        <g id="data_synchronization_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Data Synchronization Plug-in API</text>
+        </g>
+        <g id="sync_alert_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Sync Alert Handler API</text>
+        </g>
+        <g id="syncml_notifier_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">SyncML Notifier API</text>
+        </g>
+        <g id="syncml_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">SyncML Client API</text>
+        </g>
+        <g id="device_management_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Device Management plug-in API</text>
+        </g>
+        <g id="dm_tree_apis" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">DM Tree APIs</text>
+        </g>
+        <g id="terminal_security_device_lock_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Terminal Security Device Lock API</text>
+        </g>
+        <g id="policy_management_request_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Policy Management Request API</text>
+        </g>
+        <g id="ds_constant_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">DS Constant Definitions API</text>
+        </g>
+        <g id="scp_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">SCP Server API</text>
+        </g>
+        <g id="data_synchronization_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Data Synchronization Notification API</text>
+        </g>
+        <g id="oma_provisioning_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">OMA Provisioning Engine API</text>
+        </g>
+        <g id="dm_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">DM Utils API</text>
+        </g>
+        <g id="syncml_alert_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">SyncML Alert API</text>
+        </g>
+        <g id="obex_client_session_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">OBEX Client session API</text>
+        </g>
+        <g id="setting_enforcement_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Setting Enforcement Info API</text>
+        </g>
+        <g id="dm_constant_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">DM Constant Definitions API</text>
+        </g>
+        <g id="oma_ds_extensions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">OMA DS Extensions API</text>
+        </g>
+        <g id="pnpms_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">PNPMS Utils API</text>
+        </g>
+        <g id="diagnostics_plugin_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Diagnostics Plugin Utility API</text>
+        </g>
+        <g id="diagnostics_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Diagnostics Plug-in API</text>
+        </g>
+        <g id="diagnostics_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Diagnostics Framework API</text>
+        </g>
+        <g id="diagnostics_results_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Diagnostics Results API</text>
+        </g>
+        <g id="diagnostics_plugin_pool_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Diagnostics Plugin Pool API</text>
+        </g>
+        <g id="adaptive_history_list_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Adaptive History List API</text>
+        </g>
+        <g id="adaptive_history_list_session_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Adaptive History List Session API</text>
+        </g>
+        <g id="fota_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">FOTA Engine API</text>
+        </g>
+        <g id="update_package_storage_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Update Package Storage Plug-in API</text>
+        </g>
+        <g id="syncml_notifier_roaming_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">SyncML Notifier Roaming API</text>
+        </g>
+        <g id="sync_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Sync Service API</text>
+        </g>
+        <g id="dcmo_adapter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">DCMO Adapter API</text>
+        </g>
+        <g id="dcmo_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">DCMO Control API</text>
+        </g>
+        <g id="ds_capability_mgmt_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">DS Capability Management Plugin API</text>
+        </g>
+        <g id="dm_native_notifier_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">DM Native Notifier API</text>
+        </g>
+       </g>
+      </g>
+      <g id="policymanagement" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Policy Manage­ment</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5724,12 +8383,12 @@
         </g>
        </g>
       </g>
-      <g id="syncmlfw" transform="translate(0 56.400000000000006)" class="collection placeholder">
+      <g id="syncmlfw" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SyncML Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="terminalsecurity" transform="translate(0 18.8)" class="collection">
+      <g id="terminalsecurity" transform="translate(373.2000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Terminal Security</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5755,7 +8414,7 @@
         </g>
        </g>
       </g>
-      <g id="omaprovisioning" transform="translate(39.300000000000004 18.8)" class="collection">
+      <g id="omaprovisioning" transform="translate(412.5000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">OMA Provision­ing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5771,7 +8430,7 @@
         </g>
        </g>
       </g>
-      <g id="devicediagnosticsfw" transform="translate(0 75.2)" class="collection">
+      <g id="devicediagnosticsfw" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Dev­ice Diagnos­tics FW</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5792,7 +8451,7 @@
         </g>
        </g>
       </g>
-      <g id="dcmofw" transform="translate(30.000000000000004 75.2)" class="collection">
+      <g id="dcmofw" transform="translate(30.000000000000004 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Device Capability Management Object Framework</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5813,29 +8472,30 @@
         </g>
        </g>
       </g>
-      <g id="fotaapplication" transform="translate(30.000000000000004 37.6)" class="collection placeholder">
+      <g id="fotaapplication" transform="translate(30.000000000000004 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">FOTA App</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="remotemgmt_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">remotemgmt_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="remotemgmt_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">remotemgmt_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="remotestorage" class="package" transform="translate( 555.6 119.20000000000002)">
+     </g>
+    </g>
+    <g id="remotestorage" class="package" transform="translate( 1327.8 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="55.8" height="134.8" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="133.8">Remote Storage</text>
-     <g transform="translate(0 3.2)">
-      <g id="remotestoragefw" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="55.8" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="115.00000000000003">Remote Storage</text>
+     <g transform="translate(0 3.2)">
+      <g id="rsfw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Remote Storage Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="rsfw_access_protocol_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Remote Storage Framework Access Protocol Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="remotestoragefw" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Remote Storage Fmwk.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5871,25 +8531,14 @@
         </g>
        </g>
       </g>
-      <g id="rsfw_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">rsfw_plat</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="rsfw_access_protocol_plugin_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">rsfw_access_protocol_plugin_api</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="remoteconn" class="package" transform="translate( 613.5 119.20000000000002)">
+     </g>
+    </g>
+    <g id="remoteconn" class="package" transform="translate( 1385.7 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="48.6" height="134.8" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="48.6" x="24.3" y="133.8">Remote Connect­ivity</text>
-     <g transform="translate(0 3.2)">
-      <g id="connectivitymodules" transform="translate(0 75.2)" class="collection">
+     <rect class="package" x="0" width="48.6" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="48.6" x="24.3" y="115.00000000000003">Remote Connect­ivity</text>
+     <g transform="translate(0 3.2)">
+      <g id="connectivitymodules" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Connect­ivity Modules</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5900,7 +8549,7 @@
         </g>
        </g>
       </g>
-      <g id="remoteconn_info" transform="translate(0 18.8)" class="collection">
+      <g id="remoteconn_info" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Remote Connect­ivity Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5912,7 +8561,7 @@
         </g>
        </g>
       </g>
-      <g id="mtptransports" transform="translate(0 94)" class="collection">
+      <g id="mtptransports" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">MTP Trans­ports</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5933,7 +8582,7 @@
         </g>
        </g>
       </g>
-      <g id="mtpfws" transform="translate(17.7 75.2)" class="collection">
+      <g id="mtpfws" transform="translate(17.7 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">MTP Frame­works</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5944,7 +8593,7 @@
         </g>
        </g>
       </g>
-      <g id="mtpdataproviders" transform="translate(0 37.6)" class="collection">
+      <g id="mtpdataproviders" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">MTP Data Providers</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5965,7 +8614,7 @@
         </g>
        </g>
       </g>
-      <g id="backupandrestore" transform="translate(17.7 18.8)" class="collection">
+      <g id="backupandrestore" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Backup &amp; Restore</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5982,7 +8631,7 @@
         </g>
        </g>
       </g>
-      <g id="obex" transform="translate(30.000000000000004 37.6)" class="collection">
+      <g id="obex" transform="translate(30.000000000000004 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">OBEX</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5998,17 +8647,12 @@
         </g>
        </g>
       </g>
-      <g id="remoteconn_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">remoteconn_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="srvdiscovery" class="package" transform="translate( 664.2 119.20000000000002)">
+     </g>
+    </g>
+    <g id="srvdiscovery" class="package" transform="translate( 1436.4 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="134.8" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="133.8">Service Discovery &amp; Usage</text>
+     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Service Discovery &amp; Usage</text>
      <g transform="translate(0 3.2)">
       <g id="servicediscoveryandcontrol" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -6025,15 +8669,15 @@
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">UPnP</text>
        <g transform="translate(0 6.299999999999999)">
+        <g id="upnpstack" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UPnP Stack</text>
+        </g>
         <g id="upnpstack_plat" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UPnP Stack Platform Interfaces</text>
-        </g>
-        <g id="upnpstack" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">UPnP Stack</text>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">UPnP HTTP Transfer API</text>
         </g>
        </g>
       </g>
@@ -6051,12 +8695,58 @@
       </g>
      </g>
     </g>
-    <g id="dlnasrv" class="package" transform="translate( 946.8000000000002 0)">
+    <g id="dlnasrv" class="package" transform="translate( 2131.500000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="85.8" height="116.00000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="85.8" x="42.9" y="105" dy="0.375em">DLNA Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="upnpavcontrolpoint" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="109.79999999999998" height="97.2" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="109.79999999999998" x="54.89999999999999" y="86.2" dy="0.375em">DLNA Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="dlnasrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">DLNA Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="upnp_media_server_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">UPnP Media Server Settings API</text>
+        </g>
+        <g id="upnp_av_objects_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">UPnP A/V Objects API</text>
+        </g>
+        <g id="upnp_media_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">UPnP Media Server API</text>
+        </g>
+        <g id="upnp_security_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">UPnP Security Plugin API</text>
+        </g>
+        <g id="upnp_avcp_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">UPnP AVCP API</text>
+        </g>
+        <g id="upnp_media_server_metadata_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">UPnP Media Server Metadata API</text>
+        </g>
+        <g id="upnp_command_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">UPnP Command API</text>
+        </g>
+        <g id="upnp_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">UPnP Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="upnpavcontrolpoint" transform="translate(76.49999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">UPnP A/V Control Point</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6067,7 +8757,7 @@
         </g>
        </g>
       </g>
-      <g id="upnpmediaserver" transform="translate(0 75.2)" class="collection">
+      <g id="upnpmediaserver" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">UPnP Media Server</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6098,7 +8788,7 @@
         </g>
        </g>
       </g>
-      <g id="upnpavcontroller" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="upnpavcontroller" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">UPnP A/V Controller</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6124,7 +8814,7 @@
         </g>
        </g>
       </g>
-      <g id="upnpframework" transform="translate(0 37.6)" class="collection">
+      <g id="upnpframework" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">UPnP Frame­work</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6145,7 +8835,7 @@
         </g>
        </g>
       </g>
-      <g id="upnpsettings" transform="translate(30.000000000000004 37.6)" class="collection">
+      <g id="upnpsettings" transform="translate(30.000000000000004 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">UPnP Settings</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6161,7 +8851,7 @@
         </g>
        </g>
       </g>
-      <g id="upnpsharing" transform="translate(48.6 75.2)" class="collection">
+      <g id="upnpsharing" transform="translate(48.6 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">UPnP Sharing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6187,7 +8877,7 @@
         </g>
        </g>
       </g>
-      <g id="upnpmpxplugins" transform="translate(17.7 18.8)" class="collection">
+      <g id="upnpmpxplugins" transform="translate(94.19999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">UPnP MPX Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6198,19 +8888,101 @@
         </g>
        </g>
       </g>
-      <g id="dlnasrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">dlnasrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="btservices" class="package" transform="translate( 694.2 119.20000000000002)">
+     </g>
+    </g>
+    <g id="btservices" class="package" transform="translate( 1466.4 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="102.29999999999998" height="134.8" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="102.29999999999998" x="51.14999999999999" y="133.8">Blue­tooth Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="bluetoothengine" transform="translate(0 94)" class="collection">
+     <rect class="package" x="0" width="176.99999999999997" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="176.99999999999997" x="88.49999999999999" y="115.00000000000003">Blue­tooth Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="btservices_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">BT Services Public Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="bluetooth_power_state_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Bluetooth Power State API</text>
+        </g>
+        <g id="bluetooth_notifier_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Bluetooth Notifier API</text>
+        </g>
+       </g>
+      </g>
+      <g id="btservices_plat" transform="translate(20.700000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="120.89999999999998"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="119.49999999999997" height="6.299999999999999">BT Services Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="bluetooth_dosserver_audio_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Bluetooth DOS Server Audio API</text>
+        </g>
+        <g id="bluetooth_dut_mode_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Bluetooth DUT Mode API</text>
+        </g>
+        <g id="bluetooth_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Bluetooth Engine API</text>
+        </g>
+        <g id="bluetooth_engine_connection_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Bluetooth Engine Connection Management API</text>
+        </g>
+        <g id="bluetooth_engine_device_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Bluetooth Engine Device Management API</text>
+        </g>
+        <g id="bluetooth_engine_discovery_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Bluetooth Engine Discovery API</text>
+        </g>
+        <g id="bluetooth_engine_features_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Bluetooth Engine Features API</text>
+        </g>
+        <g id="bluetooth_engine_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Bluetooth Engine Settings API</text>
+        </g>
+        <g id="bluetooth_engine_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Bluetooth Engine Plugin API</text>
+        </g>
+        <g id="bluetooth_local_variation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Bluetooth Local Variation API</text>
+        </g>
+        <g id="bluetooth_notifier_internal_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Bluetooth Notifier internal API</text>
+        </g>
+        <g id="bluetooth_sap_connection_state_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Bluetooth SAP Connection State API</text>
+        </g>
+        <g id="bluetooth_secondary_display_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Bluetooth Secondary Display Notification API</text>
+        </g>
+       </g>
+      </g>
+      <g id="bluetoothengine" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Blue­tooth Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6271,7 +9043,7 @@
         </g>
        </g>
       </g>
-      <g id="bluetoothappprofiles" transform="translate(0 18.8)" class="collection">
+      <g id="bluetoothappprofiles" transform="translate(143.69999999999996 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Btooth. App Profiles</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6282,7 +9054,7 @@
         </g>
        </g>
       </g>
-      <g id="btservices_info" transform="translate(17.7 18.8)" class="collection">
+      <g id="btservices_info" transform="translate(161.39999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">BT Services Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6294,24 +9066,70 @@
         </g>
        </g>
       </g>
-      <g id="btservices_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">btservices_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="btservices_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">btservices_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="usbservices" class="package" transform="translate( 798.6 119.20000000000002)">
+     </g>
+    </g>
+    <g id="usbservices" class="package" transform="translate( 1645.5 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="46.5" height="134.8" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="46.5" x="23.25" y="133.8">USB Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="usbengines" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="92.99999999999999" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="92.99999999999999" x="46.49999999999999" y="115.00000000000003">USB Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="usbservices_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="92.99999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="91.59999999999998" height="6.299999999999999">USB Services Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="pictbridge_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">PictBridge API</text>
+        </g>
+        <g id="ptp_responder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">PTP Responder API</text>
+        </g>
+        <g id="ptp_transport_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">PTP Transport API</text>
+        </g>
+        <g id="usb_device_control_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">USB Device Control Plug-in API</text>
+        </g>
+        <g id="usb_notifier_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">USB Notifier API</text>
+        </g>
+        <g id="usb_personality_api_header" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">USB Personality API</text>
+        </g>
+        <g id="usb_personality_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">USB Personality Plug-in API</text>
+        </g>
+        <g id="usb_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">USB Secondary Display API</text>
+        </g>
+        <g id="usb_watcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">USB Watcher API</text>
+        </g>
+        <g id="usb_watcher_info_api_header" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">USB Watcher Info API</text>
+        </g>
+       </g>
+      </g>
+      <g id="usbengines" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">USB Engines</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6342,7 +9160,7 @@
         </g>
        </g>
       </g>
-      <g id="usbclasses" transform="translate(0 94)" class="collection">
+      <g id="usbclasses" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">USB Classes</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6373,9 +9191,9 @@
         </g>
        </g>
       </g>
-      <g id="usbuis" transform="translate(0 37.6)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">USB UIs</text>
+      <g id="usbuis" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">USB UIs</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="usbui" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -6392,31 +9210,67 @@
          <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Image­Print UI Provider</text>
         </g>
-        <g id="rndisui" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Remote NDIS UI</text>
-        </g>
         <g id="imageprintui" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">imageprintui</text>
-        </g>
-       </g>
-      </g>
-      <g id="usbservices_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">usbservices_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="shortlinkconn" class="package" transform="translate( 847.2 119.20000000000002)">
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">imageprintui</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="shortlinkconn" class="package" transform="translate( 1740.6 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="102.29999999999998" height="134.8" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="102.29999999999998" x="51.14999999999999" y="133.8">Shortlink Connectivity</text>
-     <g transform="translate(0 3.2)">
-      <g id="localconnectivityservice" transform="translate(0 75.2)" class="collection">
+     <rect class="package" x="0" width="102.29999999999998" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="102.29999999999998" x="51.14999999999999" y="115.00000000000003">Shortlink Connectivity</text>
+     <g transform="translate(0 3.2)">
+      <g id="shortlinkconn_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Shortlink Connectivity Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="obex_service_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">OBEX Service Utils API</text>
+        </g>
+        <g id="obex_service_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">OBEX Service Plugin API</text>
+        </g>
+        <g id="dialup_connection_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Dial-up Connection Status API</text>
+        </g>
+        <g id="dun_secondary_display_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">DUN Secondary Display Notification API</text>
+        </g>
+        <g id="obex_secondary_display_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">OBEX Secondary Display Notification API</text>
+        </g>
+        <g id="generic_hid_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Generic HID API</text>
+        </g>
+        <g id="locod_bearer_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Locod Bearer Plugin API</text>
+        </g>
+        <g id="usb_obexservicemanager_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">USB OBEX Service Manager Client API</text>
+        </g>
+       </g>
+      </g>
+      <g id="localconnectivityservice" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Local Connectivity Service</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6477,24 +9331,40 @@
         </g>
        </g>
       </g>
-      <g id="shortlinkconn_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">shortlinkconn_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="imghandling" class="package" transform="translate( 1034.7 0)">
+     </g>
+    </g>
+    <g id="imghandling" class="package" transform="translate( 2243.400000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000001">Image Handling</text>
-     <g transform="translate(0 3.2)">
-      <g id="imagehandlinglib" transform="translate(0 56.400000000000006)" class="collection placeholder">
+     <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Image Handling</text>
+     <g transform="translate(0 3.2)">
+      <g id="imagehandling_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Image Handling Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="image_handling_library_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Image Handling Library API</text>
+        </g>
+        <g id="3gp_library_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">3GP Library API</text>
+        </g>
+        <g id="thumbnailmanager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Thumbnail Manager API</text>
+        </g>
+       </g>
+      </g>
+      <g id="imagehandlinglib" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Image Handling Library</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imagehandlingutilities" transform="translate(0 37.6)" class="collection">
+      <g id="imagehandlingutilities" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Image Handling Utilities</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6505,19 +9375,51 @@
         </g>
        </g>
       </g>
-      <g id="imagehandling_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">imagehandling_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="metadatasrv" class="package" transform="translate( 1064.7 0)">
+     </g>
+    </g>
+    <g id="metadatasrv" class="package" transform="translate( 2273.400000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">Legacy Metadata Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="mediamanagementutilities" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="48.6" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="48.6" x="24.3" y="86.2" dy="0.375em">Legacy Metadata Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="metadatasrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Legacy Metadata Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="content_listing_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Content Listing Framework API</text>
+        </g>
+        <g id="media_fetch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Media Fetch API</text>
+        </g>
+       </g>
+      </g>
+      <g id="metadatasrv_plat" transform="translate(20.700000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Legacy Metadata Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="media_fetch_implementation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Media Fetch Implementation API</text>
+        </g>
+        <g id="content_listing_framework_collection_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Content Listing Framework Collection Manager API</text>
+        </g>
+        <g id="content_listing_framework_extended_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Content Listing Framework Extended API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mediamanagementutilities" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Media Mgmt. Utilities</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6528,24 +9430,61 @@
         </g>
        </g>
       </g>
-      <g id="metadatasrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">metadatasrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="metadatasrv_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">metadatasrv_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="mds" class="package" transform="translate( 1100.1000000000001 0)">
+     </g>
+    </g>
+    <g id="mds" class="package" transform="translate( 2324.100000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="122.1" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="122.1" x="61.05" y="115.00000000000001">Metadata Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="metadataengine" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="122.1" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="122.1" x="61.05" y="96.2">Metadata Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="mds_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Metadata Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="context_engine_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Context Engine Plugin API</text>
+        </g>
+        <g id="harvester_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Harvester Framework API</text>
+        </g>
+        <g id="location_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Location Manager API</text>
+        </g>
+        <g id="metadata_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Metadata Engine API</text>
+        </g>
+        <g id="content_listing_framework_collection_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Content Listing Framework Collection Manager API</text>
+        </g>
+        <g id="content_listing_framework_extended_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Content Listing Framework Extended API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mds_pub" transform="translate(57.9 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Metadata Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="content_listing_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Content Listing Framework API</text>
+        </g>
+       </g>
+      </g>
+      <g id="metadataengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Metadata Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6566,7 +9505,7 @@
         </g>
        </g>
       </g>
-      <g id="locationmanager" transform="translate(0 75.2)" class="collection">
+      <g id="locationmanager" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Location Manager</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6587,7 +9526,7 @@
         </g>
        </g>
       </g>
-      <g id="contextengine" transform="translate(30.000000000000004 56.400000000000006)" class="collection">
+      <g id="contextengine" transform="translate(30.000000000000004 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Context Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6598,7 +9537,7 @@
         </g>
        </g>
       </g>
-      <g id="harvester" transform="translate(47.7 56.400000000000006)" class="collection">
+      <g id="harvester" transform="translate(47.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Harvester</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6644,28 +9583,104 @@
         </g>
        </g>
       </g>
-      <g id="watchdog" transform="translate(0 37.6)" class="collection placeholder">
+      <g id="watchdog" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Watchdog</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mds_pub" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">mds_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="mds_plat" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">mds_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="mmuifw" class="package" transform="translate( 1224.3000000000002 0)">
+     </g>
+    </g>
+    <g id="mmuifw" class="package" transform="translate( 2448.3000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="101.39999999999998" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="115.00000000000001">Multi­media UI Fmwk.</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="148.8" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="148.8" x="74.4" y="86.2" dy="0.375em">Multi­media UI Fmwk.</text>
+     <g transform="translate(0 3.2)">
+      <g id="mmuifw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="148.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="147.4" height="6.299999999999999">MM UI FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="alf_widgetfactory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">ALF Widget Factory API</text>
+        </g>
+        <g id="alf_widgetutils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">ALF Widget Utils API</text>
+        </g>
+        <g id="alf_widgetmodel_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">ALF Widget Model API</text>
+        </g>
+        <g id="osn_container_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">OSN Container API</text>
+        </g>
+        <g id="osn_global_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">OSN Global API</text>
+        </g>
+        <g id="osn_string_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">OSN String API</text>
+        </g>
+        <g id="alf_resourcepool_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">ALF Resource Pool API</text>
+        </g>
+        <g id="alf_containerwidget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">ALF Container Widget API</text>
+        </g>
+        <g id="alf_viewwidget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">ALF View Widget API</text>
+        </g>
+        <g id="alf_scrollbarwidget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">ALF Scrollbar Widget API</text>
+        </g>
+        <g id="alf_customlayoutmanagers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">ALF Custom Layout Managers API</text>
+        </g>
+        <g id="gesturehelper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Gesture Helper API</text>
+        </g>
+        <g id="mul_coverflowwidget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">MUL Coverflow Widget API</text>
+        </g>
+        <g id="mul_datamodel_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">MUL Data Model API</text>
+        </g>
+        <g id="mul_sliderwidget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">MUL Slider Widget API</text>
+        </g>
+        <g id="mul_widget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">MUL Widget API</text>
+        </g>
+       </g>
+      </g>
       <g id="osncore" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">OS Neutral Library Core</text>
@@ -6737,19 +9752,35 @@
         </g>
        </g>
       </g>
-      <g id="mmuifw_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">mmuifw_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="videoutils" class="package" transform="translate( 1327.8000000000002 0)">
+     </g>
+    </g>
+    <g id="videoutils" class="package" transform="translate( 2599.2000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="39.300000000000004" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="115.00000000000001">Video Utils</text>
-     <g transform="translate(0 3.2)">
-      <g id="videoscheduler" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="39.300000000000004" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="96.2">Video Utils</text>
+     <g transform="translate(0 3.2)">
+      <g id="videoutils_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Video Utils Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="videoscheduler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Scheduler API</text>
+        </g>
+        <g id="videoconnutility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Video Connection Utility API</text>
+        </g>
+        <g id="videoplayer_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Videoplayer Constants API</text>
+        </g>
+       </g>
+      </g>
+      <g id="videoscheduler" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Video Sched­uler</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6765,7 +9796,7 @@
         </g>
        </g>
       </g>
-      <g id="videoconnutility" transform="translate(20.700000000000003 37.6)" class="collection">
+      <g id="videoconnutility" transform="translate(20.700000000000003 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Video Conn. Utility</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6781,19 +9812,140 @@
         </g>
        </g>
       </g>
-      <g id="videoutils_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">videoutils_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="mmmw" class="package" transform="translate( 951.6 119.20000000000002)">
+     </g>
+    </g>
+    <g id="mmmw" class="package" transform="translate( 1845 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="82.79999999999998" height="134.8" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="82.79999999999998" x="41.39999999999999" y="133.8">Multi­media Middle­ware</text>
-     <g transform="translate(0 3.2)">
-      <g id="mmfenh" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="308.1000000000001" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="308.1000000000001" x="154.05000000000004" y="115.00000000000003">Multi­media Middle­ware</text>
+     <g transform="translate(0 3.2)">
+      <g id="mmmw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="223.2000000000001"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="221.8000000000001" height="6.299999999999999">MM Middle­ware Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="multimedia_data_source_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Multimedia Data Source API</text>
+        </g>
+        <g id="progressive_download_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Progressive Download API</text>
+        </g>
+        <g id="equalizer_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Equalizer UI API</text>
+        </g>
+        <g id="enhanced_media_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Enhanced Media Client API</text>
+        </g>
+        <g id="stream_control_custom_command_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Stream Control Custom Command API</text>
+        </g>
+        <g id="emc_buffer_source_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">EMC Buffer Source API</text>
+        </g>
+        <g id="emc_file_source_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">EMC File Source API</text>
+        </g>
+        <g id="audio_metadata_reader_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Audio MetaData Reader API</text>
+        </g>
+        <g id="emc_progressive_download_source_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">EMC Progressive Download Source API</text>
+        </g>
+        <g id="emc_volume_effect_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">EMC Volume Effect API</text>
+        </g>
+        <g id="emc_balance_effect_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">EMC Balance Effect API</text>
+        </g>
+        <g id="emc_descriptor_source_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">EMC Descriptor Source API</text>
+        </g>
+        <g id="emc_drm_config_intfc_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">EMC DRM Config Intfc API</text>
+        </g>
+        <g id="voip_audio_services_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">VoIP Audio Services</text>
+        </g>
+        <g id="configuration_components_factory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Configuration Components Factory API</text>
+        </g>
+        <g id="audio_output_control_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Audio Output Control Utility API</text>
+        </g>
+        <g id="audio_output_control_utility_proxy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Audio Output Control Utility Proxy API</text>
+        </g>
+        <g id="emc_audio_effects_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">EMC Audio Effects API</text>
+        </g>
+        <g id="call_audio_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Call AudioControl API</text>
+        </g>
+        <g id="radio_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Radio Utilities API</text>
+        </g>
+        <g id="radio_preset_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Radio Preset Utilities API</text>
+        </g>
+        <g id="radio_monitor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Radio Monitor API</text>
+        </g>
+        <g id="thumbnail_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Thumbnail Engine API</text>
+        </g>
+        <g id="telephony_multimedia_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Telephony Multimedia Service API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mmfenh" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">MMF Enhancements</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6834,7 +9986,7 @@
         </g>
        </g>
       </g>
-      <g id="mmserv" transform="translate(0 18.8)" class="collection">
+      <g id="mmserv" transform="translate(225.3000000000001 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Multimedia Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6875,7 +10027,7 @@
         </g>
        </g>
       </g>
-      <g id="mmmw_info" transform="translate(67.19999999999999 18.8)" class="collection">
+      <g id="mmmw_info" transform="translate(292.50000000000006 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">MM Middle­ware Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6887,17 +10039,12 @@
         </g>
        </g>
       </g>
-      <g id="mmmw_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">mmmw_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="helix" class="package" transform="translate( 1036.5 119.20000000000002)">
+     </g>
+    </g>
+    <g id="helix" class="package" transform="translate( 2155.2000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="134.8" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="133.8">Helix</text>
+     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Helix</text>
      <g transform="translate(0 3.2)">
       <g id="helix_ren" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -6912,12 +10059,58 @@
       </g>
      </g>
     </g>
-    <g id="camerasrv" class="package" transform="translate( 1369.2000000000003 0)">
+    <g id="camerasrv" class="package" transform="translate( 2640.600000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000001">Camera Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="camappengine" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="92.09999999999998" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="92.09999999999998" x="46.04999999999999" y="96.2">Camera Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="camerasrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Camera Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="media_recorder_sink_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Media Recorder Sink API</text>
+        </g>
+        <g id="cae_extentension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">CAE Extension API</text>
+        </g>
+        <g id="camera_application_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Camera Application Engine API</text>
+        </g>
+        <g id="custom_onboard_camera_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Custom Onboard Camera API</text>
+        </g>
+        <g id="imaging_configuration_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Imaging Configuration Manager API</text>
+        </g>
+        <g id="media_recorder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Media Recorder API</text>
+        </g>
+        <g id="3gp_file_composer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">3GP File Composer API</text>
+        </g>
+        <g id="asynchronous_file_saving_queue_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Asynchronous File Saving Queue API</text>
+        </g>
+       </g>
+      </g>
+      <g id="camappengine" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Camera App Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6933,7 +10126,7 @@
         </g>
        </g>
       </g>
-      <g id="camcordermmfplugin" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="camcordermmfplugin" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Cam­corder MMF Plugin</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6944,7 +10137,7 @@
         </g>
        </g>
       </g>
-      <g id="configmanagers" transform="translate(0 18.8)" class="collection">
+      <g id="configmanagers" transform="translate(76.49999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Config Managers</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6955,19 +10148,130 @@
         </g>
        </g>
       </g>
-      <g id="camerasrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">camerasrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="mmappfw" class="package" transform="translate( 1399.2000000000003 0)">
+     </g>
+    </g>
+    <g id="mmappfw" class="package" transform="translate( 2734.8000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="74.39999999999999" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="74.39999999999999" x="37.199999999999996" y="115.00000000000001">Multi­media App Fmwk.</text>
-     <g transform="translate(0 3.2)">
-      <g id="mpx" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="204.60000000000008" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="204.60000000000008" x="102.30000000000004" y="96.2">Multi­media App Fmwk.</text>
+     <g transform="translate(0 3.2)">
+      <g id="mmappfw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="204.60000000000008"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="203.20000000000007" height="6.299999999999999">MM App FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="inc" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Inc</text>
+        </g>
+        <g id="collection_helper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Collection Helper API</text>
+        </g>
+        <g id="harvester_collection_mediator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Harvester Collection Mediator API</text>
+        </g>
+        <g id="harvester_metadata_extractor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Harvester Metadata Extractor API</text>
+        </g>
+        <g id="harvester_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Harvester Server API</text>
+        </g>
+        <g id="harvester_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Harvester Utility API</text>
+        </g>
+        <g id="playlist_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Playlist Engine API</text>
+        </g>
+        <g id="mtp_keys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">MTP Keys API</text>
+        </g>
+        <g id="mpx_collection_common_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">MPX Collection Common Definition API</text>
+        </g>
+        <g id="mpx_collection_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">MPX Collection Utility API</text>
+        </g>
+        <g id="mpx_common_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">MPX Common API</text>
+        </g>
+        <g id="mpx_common_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">MPX Common Definition API</text>
+        </g>
+        <g id="mpx_playback_common_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">MPX Playback Common Definition API</text>
+        </g>
+        <g id="mpx_playback_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">MPX Playback Utility API</text>
+        </g>
+        <g id="mpx_base_view_plugins_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">MPX Base View Plugins API</text>
+        </g>
+        <g id="mpx_view_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">MPX View Utility API</text>
+        </g>
+        <g id="mpx_albumart_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">MPX Album Art Utility API</text>
+        </g>
+        <g id="media_player_settings_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Media Player Settings Engine API</text>
+        </g>
+        <g id="mpx_backstepping_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">MPX Backstepping Utility API</text>
+        </g>
+        <g id="asx_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">ASX Parser API</text>
+        </g>
+        <g id="playback_helper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Playback Helper API</text>
+        </g>
+        <g id="videoplaylist_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Video Playlist Utility API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mpx" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Multi­media Player</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6993,7 +10297,7 @@
         </g>
        </g>
       </g>
-      <g id="mmappcomponents" transform="translate(0 37.6)" class="collection">
+      <g id="mmappcomponents" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Multi­media App Cmp.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7039,18 +10343,85 @@
         </g>
        </g>
       </g>
-      <g id="mmappfw_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">mmappfw_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="inputmethods" class="package" transform="translate( 1066.5 119.20000000000002)">
+     </g>
+    </g>
+    <g id="inputmethods" class="package" transform="translate( 2185.2000000000003 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="213.00000000000006" height="134.8" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="213.00000000000006" x="106.50000000000003" y="133.8">Input Methods</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="195.30000000000007" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="195.30000000000007" x="97.65000000000003" y="115.00000000000003">Input Methods</text>
+     <g transform="translate(0 3.2)">
+      <g id="inputmethods_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Input Methods Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="ptiengine_iti_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">PTI Engine API</text>
+        </g>
+        <g id="optical_character_recognition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Optical Character Recognition API</text>
+        </g>
+        <g id="input_language_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Input Language Info API</text>
+        </g>
+       </g>
+      </g>
+      <g id="inputmethods_plat" transform="translate(30.000000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Input Methods Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="pen_input_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Pen Input Server API</text>
+        </g>
+        <g id="ptiengine_hwr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">PTI Engine Handwriting Recognition API</text>
+        </g>
+        <g id="aknfep_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Avkon FEP Settings API</text>
+        </g>
+        <g id="aknfep_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Avkon FEP Status API</text>
+        </g>
+        <g id="ptiengine_key_definations_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">PTI Engine Key Definitions API</text>
+        </g>
+        <g id="aknfep_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Avkon FEP Definitions API</text>
+        </g>
+        <g id="aknfep_pen_support_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Avkon FEP Pen Support API</text>
+        </g>
+        <g id="ptiengine_indic_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">PTI Engine Indic Definitions API</text>
+        </g>
+        <g id="aknfep_uiinterface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Avkon FEP UI Interface API</text>
+        </g>
+       </g>
+      </g>
       <g id="textinput" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="195.30000000000007"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="193.90000000000006" height="6.299999999999999">Text Input</text>
@@ -7178,7 +10549,7 @@
         </g>
        </g>
       </g>
-      <g id="inputmethods_info" transform="translate(197.40000000000006 18.8)" class="collection">
+      <g id="inputmethods_info" transform="translate(115.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Input Methods Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7190,29 +10561,791 @@
         </g>
        </g>
       </g>
-      <g id="inputmethods_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">inputmethods_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="inputmethods_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">inputmethods_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="classicui" class="package" transform="translate( 1281.6000000000001 119.20000000000002)">
+     </g>
+    </g>
+    <g id="classicui" class="package" transform="translate( 2382.6000000000004 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="93.3" height="134.8" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="93.3" x="46.65" y="133.8">Classic UI</text>
-     <g transform="translate(0 3.2)">
-      <g id="ode" transform="translate(0 75.2)" class="collection placeholder">
+     <rect class="package" x="0" width="1511.0999999999988" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="1511.0999999999988" x="755.5499999999994" y="115.00000000000003">Classic UI</text>
+     <g transform="translate(0 3.2)">
+      <g id="classicui_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="836.9999999999989"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="835.5999999999989" height="6.299999999999999">Classic UI Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="personalisation_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Personalisation Framework API</text>
+        </g>
+        <g id="signal_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Signal Pane API</text>
+        </g>
+        <g id="japanese_reading_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Japanese Reading API</text>
+        </g>
+        <g id="global_popup_priority_controller_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Global Popup Priority Controller API</text>
+        </g>
+        <g id="item_finder_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Item Finder API</text>
+        </g>
+        <g id="avkon_fonts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Avkon Fonts API</text>
+        </g>
+        <g id="extended_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Extended Utilities API</text>
+        </g>
+        <g id="personalisation_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Personalisation Plugin API</text>
+        </g>
+        <g id="extended_aiw_criteria_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Extended AIW Criteria API</text>
+        </g>
+        <g id="personalisation_application_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Personalisation Application API</text>
+        </g>
+        <g id="volume_popup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Volume Popup API</text>
+        </g>
+        <g id="avkon_secondary_display_support_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">AVKON Secondary Display Support API</text>
+        </g>
+        <g id="extended_setting_pages_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Extended Setting Pages API</text>
+        </g>
+        <g id="extended_lists_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Extended Lists API</text>
+        </g>
+        <g id="input_block_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Input Block API</text>
+        </g>
+        <g id="avkon_ui_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">AVKON UI Server API</text>
+        </g>
+        <g id="number_grouping_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Number Grouping API</text>
+        </g>
+        <g id="extended_status_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Extended Status Pane API</text>
+        </g>
+        <g id="extended_notifiers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Extended Notifiers API</text>
+        </g>
+        <g id="task_list_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Task List API</text>
+        </g>
+        <g id="personalisation_slide_show_dialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Personalisation Slide Show Dialog API</text>
+        </g>
+        <g id="key_event_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Key Event Utilities API</text>
+        </g>
+        <g id="emergency_call_support_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Emergency Call Support API</text>
+        </g>
+        <g id="extended_dialogs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Extended Dialogs API</text>
+        </g>
+        <g id="legacy_ui_framework_headers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Legacy UI Framework Headers API</text>
+        </g>
+        <g id="extended_editors_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Extended Editors API</text>
+        </g>
+        <g id="alarm_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Alarm API</text>
+        </g>
+        <g id="aiw_service_interface_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">AIW Service Interface Base API</text>
+        </g>
+        <g id="list_effects_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">List Effects API</text>
+        </g>
+        <g id="find_item_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Find Item UI API</text>
+        </g>
+        <g id="server_application_services_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Server Application Services API</text>
+        </g>
+        <g id="common_ui_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Common UI Settings API</text>
+        </g>
+        <g id="aiw_service_interface_menu_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">AIW Service Interface Menu API</text>
+        </g>
+        <g id="eikon_server_extension_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">EIKON Server Extension Client API</text>
+        </g>
+        <g id="skinnable_clock_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Skinnable Clock API</text>
+        </g>
+        <g id="battery_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">Battery Pane API</text>
+        </g>
+        <g id="fep_document_navigation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">FEP Document Navigation API</text>
+        </g>
+        <g id="personalisation_localised_texts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Personalisation Localised Texts API</text>
+        </g>
+        <g id="memory_card_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Memory Card UI API</text>
+        </g>
+        <g id="avkon_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">AVKON Status API</text>
+        </g>
+        <g id="application_switching_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Application Switching API</text>
+        </g>
+        <g id="avkon_localised_texts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">AVKON Localised Texts API</text>
+        </g>
+        <g id="avkon_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">AVKON Secondary Display API</text>
+        </g>
+        <g id="extended_animation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Extended Animation API</text>
+        </g>
+        <g id="extended_notes_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Extended Notes API</text>
+        </g>
+        <g id="screensaver_animation_plugin_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">Screensaver Animation Plugin Definitions API</text>
+        </g>
+        <g id="text_scroller_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Text Scroller API</text>
+        </g>
+        <g id="custom_cursors_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Custom Cursors API</text>
+        </g>
+        <g id="screensaver_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="446.4000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="451.05000000000035">Screensaver Settings API</text>
+        </g>
+        <g id="global_window_priorities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="455.7000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="460.35000000000036">Global Window Priorities API</text>
+        </g>
+        <g id="extended_indicators_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="465.0000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="469.6500000000004">Extended Indicators API</text>
+        </g>
+        <g id="special_character_table_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="474.3000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="478.9500000000004">Special Character Table API</text>
+        </g>
+        <g id="avkon_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="483.6000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="488.2500000000004">AVKON Settings API</text>
+        </g>
+        <g id="extended_sounds_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="492.90000000000043" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="497.5500000000004">Extended Sounds API</text>
+        </g>
+        <g id="themes_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="502.20000000000044" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="506.8500000000004">Themes Settings API</text>
+        </g>
+        <g id="media_shared_document_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="511.50000000000045" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="516.1500000000004">Media Shared Document API</text>
+        </g>
+        <g id="extended_queries_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="520.8000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="525.4500000000004">Extended Queries API</text>
+        </g>
+        <g id="phone_number_text_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="530.1000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="534.7500000000003">Phone Number Text Utilities API</text>
+        </g>
+        <g id="screensaver_runtime_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="539.4000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="544.0500000000003">Screensaver Runtime API</text>
+        </g>
+        <g id="extended_scroller_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="548.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="553.3500000000003">Extended Scroller API</text>
+        </g>
+        <g id="key_rotator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="558.0000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="562.6500000000002">Key Rotator API</text>
+        </g>
+        <g id="extended_grids_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="567.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="571.9500000000002">Extended Grids API</text>
+        </g>
+        <g id="generic_parameter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="576.6000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="581.2500000000001">Generic Parameter API</text>
+        </g>
+        <g id="indicator_touch_observer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="585.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="590.5500000000001">Indicator Touch Observer API</text>
+        </g>
+        <g id="popup_form_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="595.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="599.85">Popup Form API</text>
+        </g>
+        <g id="stylus_activated_popup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="604.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="609.15">Stylus Activated Pop-up API</text>
+        </g>
+        <g id="indicator_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="613.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="618.4499999999999">Indicator Plugin API</text>
+        </g>
+        <g id="layout_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="623.0999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="627.7499999999999">Layout Configuration API</text>
+        </g>
+        <g id="common_file_dialogs_filter_factory_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="632.3999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="637.0499999999998">Common File Dialogs Filter Factory API</text>
+        </g>
+        <g id="avkon_anim_dll_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="641.6999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="646.3499999999998">AVKON Anim DLL API</text>
+        </g>
+        <g id="extended_initialization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="650.9999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="655.6499999999998">Extended Initialization API</text>
+        </g>
+        <g id="long_tap_animation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="660.2999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="664.9499999999997">Long Tap Animation API</text>
+        </g>
+        <g id="extended_ui_framework_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="669.5999999999997" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="674.2499999999997">Extended UI Framework Definitions API</text>
+        </g>
+        <g id="extended_buttons_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="678.8999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="683.5499999999996">Extended Buttons API</text>
+        </g>
+        <g id="aiw_provider_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="688.1999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="692.8499999999996">AIW Provider Utility API</text>
+        </g>
+        <g id="transition_effect_parameters_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="697.4999999999996" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="702.1499999999995">Transition Effect Parameters API</text>
+        </g>
+        <g id="extended_input_capabilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="706.7999999999995" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="711.4499999999995">Extended Input Capabilities API</text>
+        </g>
+        <g id="uikon_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="716.0999999999995" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="720.7499999999994">UIKON Status API</text>
+        </g>
+        <g id="transition_effect_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="725.3999999999994" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="730.0499999999994">Transition Effect Utilities API</text>
+        </g>
+        <g id="pointer_event_modifier_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="734.6999999999994" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="739.3499999999993">Pointer Event Modifier API</text>
+        </g>
+        <g id="avkon_testability_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="743.9999999999993" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="748.6499999999993">AVKON Testability API</text>
+        </g>
+        <g id="ganes_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="753.2999999999993" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="757.9499999999993">ganes_api</text>
+        </g>
+        <g id="ode_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="762.5999999999992" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="767.2499999999992">Ode API</text>
+        </g>
+        <g id="physics_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="771.8999999999992" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="776.5499999999992">Physics API</text>
+        </g>
+        <g id="touch_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="781.1999999999991" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="785.8499999999991">Touch Pane API</text>
+        </g>
+        <g id="touch_pane_observer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="790.4999999999991" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="795.1499999999991">Touch Pane Observer API</text>
+        </g>
+        <g id="alternate_fs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="799.799999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="804.449999999999">Alternate FS API</text>
+        </g>
+        <g id="discreet_popup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="809.099999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="813.749999999999">Discreet Popup API</text>
+        </g>
+        <g id="touch_gesture_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="818.399999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="823.0499999999989">Touch Gesture Framework API</text>
+        </g>
+        <g id="extended_options_menu_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="827.6999999999989" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="832.3499999999989">Extended Options Menu API</text>
+        </g>
+       </g>
+      </g>
+      <g id="classicui_pub" transform="translate(839.0999999999989 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="576.6000000000001"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="575.2000000000002" height="6.299999999999999">Classic UI Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="input_frame_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Input Frame API</text>
+        </g>
+        <g id="window_server_event_observer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Window Server Event Observer API</text>
+        </g>
+        <g id="application_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Application Framework API</text>
+        </g>
+        <g id="scroller_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Scroller API</text>
+        </g>
+        <g id="ui_framework_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">UI Framework Utilities API</text>
+        </g>
+        <g id="ui_framework_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">UI Framework Definitions API</text>
+        </g>
+        <g id="buttons_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Buttons API</text>
+        </g>
+        <g id="queries_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Queries API</text>
+        </g>
+        <g id="aiw_generic_parameter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">AIW Generic Parameter API</text>
+        </g>
+        <g id="editors_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Editors API</text>
+        </g>
+        <g id="common_file_dialogs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Common File Dialogs API</text>
+        </g>
+        <g id="dialog_shutter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Dialog Shutter API</text>
+        </g>
+        <g id="fonts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Fonts API</text>
+        </g>
+        <g id="screen_clearer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Screen Clearer API</text>
+        </g>
+        <g id="notifiers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Notifiers API</text>
+        </g>
+        <g id="notes_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Notes API</text>
+        </g>
+        <g id="screen_saver_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Screen Saver API</text>
+        </g>
+        <g id="status_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Status Pane API</text>
+        </g>
+        <g id="base_controls_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Base Controls API</text>
+        </g>
+        <g id="grids_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Grids API</text>
+        </g>
+        <g id="context_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Context Pane API</text>
+        </g>
+        <g id="lists_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Lists API</text>
+        </g>
+        <g id="popups_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Popups API</text>
+        </g>
+        <g id="misc_controls_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Misc Controls API</text>
+        </g>
+        <g id="keylock_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Keylock API</text>
+        </g>
+        <g id="options_menu_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Options Menu API</text>
+        </g>
+        <g id="hierarchical_lists_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Hierarchical Lists API</text>
+        </g>
+        <g id="navigation_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Navigation Pane API</text>
+        </g>
+        <g id="tabs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Tabs API</text>
+        </g>
+        <g id="title_pane_touch_observer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Title Pane Touch Observer API</text>
+        </g>
+        <g id="choice_list_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Choice List API</text>
+        </g>
+        <g id="info_popup_note_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Info Popup Note API</text>
+        </g>
+        <g id="setting_pages_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">Setting Pages API</text>
+        </g>
+        <g id="screen_mode_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Screen Mode API</text>
+        </g>
+        <g id="indicators_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Indicators API</text>
+        </g>
+        <g id="error_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">Error UI API</text>
+        </g>
+        <g id="animation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">Animation API</text>
+        </g>
+        <g id="searchfield_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Searchfield API</text>
+        </g>
+        <g id="labels_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Labels API</text>
+        </g>
+        <g id="hotkeys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">Hotkeys API</text>
+        </g>
+        <g id="initialization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Initialization API</text>
+        </g>
+        <g id="volume_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">Volume Control API</text>
+        </g>
+        <g id="title_pane_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">Title Pane API</text>
+        </g>
+        <g id="sounds_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Sounds API</text>
+        </g>
+        <g id="aiw_service_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">AIW Service Handler API</text>
+        </g>
+        <g id="aiw_criteria_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">AIW Criteria API</text>
+        </g>
+        <g id="touch_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Touch UI Utilities API</text>
+        </g>
+        <g id="generic_button_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Generic Button API</text>
+        </g>
+        <g id="form_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="446.4000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="451.05000000000035">Form API</text>
+        </g>
+        <g id="uikon_core_controls" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="455.7000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="460.35000000000036">Uikon Core Controls</text>
+        </g>
+        <g id="calendar_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="465.0000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="469.6500000000004">Calendar API</text>
+        </g>
+        <g id="toolbar_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="474.3000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="478.9500000000004">Toolbar API</text>
+        </g>
+        <g id="server_application_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="483.6000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="488.2500000000004">Server Application API</text>
+        </g>
+        <g id="slider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="492.90000000000043" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="497.5500000000004">Slider API</text>
+        </g>
+        <g id="private_ui_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="502.20000000000044" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="506.8500000000004">Private UI Framework API</text>
+        </g>
+        <g id="dialogs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="511.50000000000045" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="516.1500000000004">Dialogs API</text>
+        </g>
+        <g id="document_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="520.8000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="525.4500000000004">Document handler API</text>
+        </g>
+        <g id="images_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="530.1000000000004" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="534.7500000000003">Images API</text>
+        </g>
+        <g id="stylus_popup_menu_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="539.4000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="544.0500000000003">Stylus Pop-up Menu API</text>
+        </g>
+        <g id="information_preview_popup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="548.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="553.3500000000003">Information Preview Popup API</text>
+        </g>
+        <g id="intermediate_state_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="558.0000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="562.6500000000002">Intermediate State API</text>
+        </g>
+        <g id="help_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="567.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="571.9500000000002">Help Launcher API</text>
+        </g>
+       </g>
+      </g>
+      <g id="ode" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Open Dynamics Engine</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="uifw" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="uifw" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">UI Frame­work</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7248,7 +11381,7 @@
         </g>
        </g>
       </g>
-      <g id="commonuis" transform="translate(0 18.8)" class="collection">
+      <g id="commonuis" transform="translate(1417.799999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Common UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7264,7 +11397,7 @@
         </g>
        </g>
       </g>
-      <g id="applicationinterworkingfw" transform="translate(0 37.6)" class="collection">
+      <g id="applicationinterworkingfw" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">App Inter­working Fmwk.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7275,22 +11408,22 @@
         </g>
        </g>
       </g>
-      <g id="psln" transform="translate(20.700000000000003 18.8)" class="collection placeholder">
+      <g id="psln" transform="translate(1438.4999999999989 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Personal­ization</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="commonadapter" transform="translate(17.7 75.2)" class="collection placeholder">
+      <g id="commonadapter" transform="translate(17.7 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Common Adapter</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="akntouchgesturefw" transform="translate(17.7 37.6)" class="collection placeholder">
+      <g id="akntouchgesturefw" transform="translate(17.7 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Avkon Touch Gesture Framework</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="uiutils" transform="translate(38.400000000000006 18.8)" class="collection">
+      <g id="uiutils" transform="translate(1456.199999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">UI Utils</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7316,7 +11449,7 @@
         </g>
        </g>
       </g>
-      <g id="commonuisupport" transform="translate(35.4 75.2)" class="collection">
+      <g id="commonuisupport" transform="translate(35.4 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Common UI Support</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7348,7 +11481,7 @@
         </g>
        </g>
       </g>
-      <g id="lafagnosticuifoundation" transform="translate(0 94)" class="collection">
+      <g id="lafagnosticuifoundation" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Look-and-Feel Agnostic UI Found­ation</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7384,7 +11517,7 @@
         </g>
        </g>
       </g>
-      <g id="classicui_info" transform="translate(77.7 18.8)" class="collection">
+      <g id="classicui_info" transform="translate(1495.4999999999989 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Classic UI Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7396,24 +11529,30 @@
         </g>
        </g>
       </g>
-      <g id="classicui_pub" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">classicui_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="classicui_plat" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">classicui_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="svgt" class="package" transform="translate( 1377.0000000000002 119.20000000000002)">
+     </g>
+    </g>
+    <g id="svgt" class="package" transform="translate( 3895.799999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="134.8" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="133.8">SVG Tiny</text>
-     <g transform="translate(0 3.2)">
-      <g id="svgtopt" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">SVG Tiny</text>
+     <g transform="translate(0 3.2)">
+      <g id="svgt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">SVG Tiny Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="svgt_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">SVGT API</text>
+        </g>
+        <g id="nvg_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">NVG API</text>
+        </g>
+       </g>
+      </g>
+      <g id="svgtopt" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SVG-T Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7424,19 +11563,50 @@
         </g>
        </g>
       </g>
-      <g id="svgt_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">svgt_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="uiaccelerator" class="package" transform="translate( 1407.0000000000002 119.20000000000002)">
+     </g>
+    </g>
+    <g id="uiaccelerator" class="package" transform="translate( 3925.799999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="134.8" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="133.8">UI Accel­erator</text>
-     <g transform="translate(0 3.2)">
-      <g id="uiacceltk" transform="translate(0 75.2)" class="collection">
+     <rect class="package" x="0" width="55.8" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="115.00000000000003">UI Accel­erator</text>
+     <g transform="translate(0 3.2)">
+      <g id="uiaccelerator_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">UI Accel­erator Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="alf_core_toolkit_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">ALF Core Toolkit API</text>
+        </g>
+        <g id="alf_visual_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">ALF Visual API</text>
+        </g>
+        <g id="alf_extended_visual_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">ALF Extended Visual API</text>
+        </g>
+        <g id="alf_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">ALF Extension API</text>
+        </g>
+        <g id="alf_tracing_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">ALF Tracing API</text>
+        </g>
+        <g id="alf_client_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">ALF Client Server API</text>
+        </g>
+       </g>
+      </g>
+      <g id="uiacceltk" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">UI Accel­erator Toolkit</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7447,19 +11617,136 @@
         </g>
        </g>
       </g>
-      <g id="uiaccelerator_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">uiaccelerator_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="uiresources" class="package" transform="translate( 1437.0000000000002 119.20000000000002)">
+     </g>
+    </g>
+    <g id="uiresources" class="package" transform="translate( 3983.699999999999 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="67.19999999999999" height="134.8" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="123.80000000000001" dy="0.375em">UI Resources</text>
-     <g transform="translate(0 3.2)">
-      <g id="uigraphics" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="262.8" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="262.8" x="131.4" y="105" dy="0.375em">UI Resources</text>
+     <g transform="translate(0 3.2)">
+      <g id="uiresources_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">UI Resources Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="pictograph_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Pictograph API</text>
+        </g>
+        <g id="skins_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Skins API</text>
+        </g>
+        <g id="font_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Font Definition API</text>
+        </g>
+        <g id="graphics_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Graphics API</text>
+        </g>
+        <g id="scalable_icons_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Scalable Icons API</text>
+        </g>
+        <g id="layout_id_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Layout ID Definitions API</text>
+        </g>
+       </g>
+      </g>
+      <g id="uiresources_plat" transform="translate(57.9 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="148.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="147.4" height="6.299999999999999">UI Resources Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="layout_system_private_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Layout System Private API</text>
+        </g>
+        <g id="layout_data_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Layout Data API</text>
+        </g>
+        <g id="cdl_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">CDL API</text>
+        </g>
+        <g id="extended_skins_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Extended Skins API</text>
+        </g>
+        <g id="tfx_server_controller_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">TFX Server Controller Plug-in API</text>
+        </g>
+        <g id="extended_fonts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Extended Fonts API</text>
+        </g>
+        <g id="graphic_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Graphic Configuration API</text>
+        </g>
+        <g id="mif_header_cdl_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">MIF Header CDL API</text>
+        </g>
+        <g id="personalisation_and_skins_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Personalisation and Skins Settings API</text>
+        </g>
+        <g id="tfx_effect_setup_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">TFX Effect Setup Plug-in API</text>
+        </g>
+        <g id="mifconv_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Mifconv Definitions API</text>
+        </g>
+        <g id="wallpaper_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Wallpaper Configuration API</text>
+        </g>
+        <g id="language_code_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Language Code Definitions API</text>
+        </g>
+        <g id="skins_image_attributes_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Skins Image Attributes API</text>
+        </g>
+        <g id="private_user_area_code_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Private User Area Code Definitions API</text>
+        </g>
+        <g id="tfx_server_plugin_ids_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">TFX Server Plug-in IDs API</text>
+        </g>
+       </g>
+      </g>
+      <g id="uigraphics" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">UI Graphics</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7490,7 +11777,7 @@
         </g>
        </g>
       </g>
-      <g id="layouts" transform="translate(0 94)" class="collection">
+      <g id="layouts" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Layouts</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7506,7 +11793,7 @@
         </g>
        </g>
       </g>
-      <g id="skins" transform="translate(0 18.8)" class="collection">
+      <g id="skins" transform="translate(208.8 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Skins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7522,7 +11809,7 @@
         </g>
        </g>
       </g>
-      <g id="pictographs" transform="translate(20.700000000000003 18.8)" class="collection">
+      <g id="pictographs" transform="translate(229.50000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Picto­graphs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7533,7 +11820,7 @@
         </g>
        </g>
       </g>
-      <g id="locales" transform="translate(0 75.2)" class="collection">
+      <g id="locales" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Locales</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7544,7 +11831,7 @@
         </g>
        </g>
       </g>
-      <g id="uiconfig" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="uiconfig" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">UI Config</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7555,7 +11842,7 @@
         </g>
        </g>
       </g>
-      <g id="fontsupport" transform="translate(48.6 37.6)" class="collection">
+      <g id="fontsupport" transform="translate(48.6 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Font Support</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7571,34 +11858,56 @@
         </g>
        </g>
       </g>
-      <g id="helpthemes" transform="translate(38.400000000000006 18.8)" class="collection placeholder">
+      <g id="helpthemes" transform="translate(247.20000000000002 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Help Themes</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="uiresources_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">uiresources_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="uiresources_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">uiresources_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="hapticsservices" class="package" transform="translate( 1506.3000000000002 119.20000000000002)">
+     </g>
+    </g>
+    <g id="hapticsservices" class="package" transform="translate( 4248.5999999999995 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="46.5" height="134.8" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="46.5" x="23.25" y="133.8">Haptics Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="tacticonserver" transform="translate(0 37.6)" class="collection placeholder">
+     <rect class="package" x="0" width="46.5" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="46.5" x="23.25" y="115.00000000000003">Haptics Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="hapticsservices_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Haptics Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="tacticon_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Tacticon API</text>
+        </g>
+        <g id="tactile_feedback_core_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Tactile Feedback Core API</text>
+        </g>
+        <g id="tactile_feedback_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Tactile Feedback Server API</text>
+        </g>
+       </g>
+      </g>
+      <g id="hapticsservices_pub" transform="translate(30.000000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Haptics Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="tactile_feedback_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Tactile Feedback Client API</text>
+        </g>
+       </g>
+      </g>
+      <g id="tacticonserver" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Tacticon Server</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="tactilefeedback" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="tactilefeedback" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Tactile Feedback</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7629,24 +11938,81 @@
         </g>
        </g>
       </g>
-      <g id="hapticsservices_pub" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">hapticsservices_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="hapticsservices_plat" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">hapticsservices_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="gsprofilesrv" class="package" transform="translate( 1554.9 119.20000000000002)">
+     </g>
+    </g>
+    <g id="gsprofilesrv" class="package" transform="translate( 4297.2 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="37.2" height="134.8" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="37.2" x="18.6" y="123.80000000000001" dy="0.375em">General Settings &amp; Profiles Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="gssettingsuis" transform="translate(0 75.2)" class="collection">
+     <rect class="package" x="0" width="104.39999999999998" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="104.39999999999998" x="52.19999999999999" y="105" dy="0.375em">General Settings &amp; Profiles Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="gsprofilesrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">GS &amp; Profiles Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="profiles_engine_active_profile_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Profiles Engine Active Profile Settings API</text>
+        </g>
+        <g id="profiles_engine_wrapper_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Profiles Engine Wrapper API</text>
+        </g>
+       </g>
+      </g>
+      <g id="gsprofilesrv_plat" transform="translate(20.700000000000003 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">GS &amp; Profiles Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="profiles_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Profiles Engine API</text>
+        </g>
+        <g id="profiles_mediafilelist_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Media File List API</text>
+        </g>
+        <g id="filelist_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">File List API</text>
+        </g>
+        <g id="settings_backgroundimage_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Settings Background Image API</text>
+        </g>
+        <g id="settings_framework_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Settings Framework API</text>
+        </g>
+        <g id="settings_launch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Settings Launch API</text>
+        </g>
+        <g id="settings_listbox_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Settings List Box API</text>
+        </g>
+        <g id="settings_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Settings Plugin API</text>
+        </g>
+        <g id="settings_uis_cenrep_collection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Settings UIs CenRep Collection API</text>
+        </g>
+       </g>
+      </g>
+      <g id="gssettingsuis" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">General Settings UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7657,7 +12023,7 @@
         </g>
        </g>
       </g>
-      <g id="profilesservices" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="profilesservices" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Profiles Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7683,39 +12049,145 @@
         </g>
        </g>
       </g>
-      <g id="gsprofilesrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">gsprofilesrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="gsprofilesrv_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">gsprofilesrv_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="homescreensrv" class="package" transform="translate( 1475.7000000000003 0)">
+     </g>
+    </g>
+    <g id="homescreensrv" class="package" transform="translate( 2941.500000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="94.2" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="94.2" x="47.1" y="29.8" dy="0.375em">Home Screen Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="xcfw" transform="translate(0 75.2)" class="collection placeholder">
+     <rect class="package" x="0" width="204.60000000000008" height="97.2" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="189.00000000000009" x="110.10000000000004" y="86.2" dy="0.375em">Home Screen Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="homescreensrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="204.60000000000008"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="203.20000000000007" height="6.299999999999999">Home Screen Services Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="ai_content_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">AI Content Model API</text>
+        </g>
+        <g id="ai_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AI Utilities API</text>
+        </g>
+        <g id="ai_plugin_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">AI Plug-in Management API</text>
+        </g>
+        <g id="ai_plugin_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">AI Plug-in Information API</text>
+        </g>
+        <g id="ai_variation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">AI Variation API</text>
+        </g>
+        <g id="action_handler_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Action Handler Plugin API</text>
+        </g>
+        <g id="content_harvester_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Content Harvester Plugin API</text>
+        </g>
+        <g id="menu_model_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Menu Model API</text>
+        </g>
+        <g id="menu_sat_interface_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Menu SAT Interface API</text>
+        </g>
+        <g id="external_home_screen_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">External Home Screen API</text>
+        </g>
+        <g id="menu_content_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Menu Content Service API</text>
+        </g>
+        <g id="sapi_contentpublishing" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">SAPI Content Publishing</text>
+        </g>
+        <g id="sapi_backstepping" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">SAPI Backstepping</text>
+        </g>
+        <g id="sapi_actionhandler" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">SAPI Action Handler</text>
+        </g>
+        <g id="sapi_homescreenplugin" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">SAPI Homescreen Plugin</text>
+        </g>
+        <g id="sapi_menucontent" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">SAPI Menu Content</text>
+        </g>
+        <g id="xcfw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">XCFW API</text>
+        </g>
+        <g id="idlefw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Idle Framework API</text>
+        </g>
+        <g id="hs_widget_publisher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Home Screen Publishing API</text>
+        </g>
+        <g id="context_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">UI Context Utility API</text>
+        </g>
+        <g id="hs_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">HS Settings API</text>
+        </g>
+        <g id="hs_content_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">HS Content Control API</text>
+        </g>
+       </g>
+      </g>
+      <g id="xcfw" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">XML Content Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="homescreenpluginsrv" transform="translate(0 94)" class="collection placeholder">
+      <g id="homescreenpluginsrv" transform="translate(0 75.2)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Home Screen Plugin Service</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="idlefw" transform="translate(17.7 75.2)" class="collection placeholder">
+      <g id="idlefw" transform="translate(17.7 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Idle Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="menucontentsrv" transform="translate(0 37.6)" class="collection">
+      <g id="menucontentsrv" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Menu Content Service</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7726,12 +12198,12 @@
         </g>
        </g>
       </g>
-      <g id="backsteppingsrv" transform="translate(0 56.400000000000006)" class="collection placeholder">
+      <g id="backsteppingsrv" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Back Stepping Service</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="contentpublishingsrv" transform="translate(17.7 56.400000000000006)" class="collection">
+      <g id="contentpublishingsrv" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Content Publishing Service</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7752,12 +12224,12 @@
         </g>
        </g>
       </g>
-      <g id="contextutility" transform="translate(17.7 37.6)" class="collection placeholder">
+      <g id="contextutility" transform="translate(17.7 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Context Utility</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="contentcontrolsrv" transform="translate(47.7 56.400000000000006)" class="collection">
+      <g id="contentcontrolsrv" transform="translate(47.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Content Control Service</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7788,19 +12260,76 @@
         </g>
        </g>
       </g>
-      <g id="homescreensrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">homescreensrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="appinstall" class="package" transform="translate( 1594.2 119.20000000000002)">
+     </g>
+    </g>
+    <g id="appinstall" class="package" transform="translate( 4403.7 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="54.00000000000001" height="134.8" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="54.00000000000001" x="27.000000000000004" y="133.8">App Install­ation</text>
-     <g transform="translate(0 3.2)">
-      <g id="ncdengine" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="157.49999999999997" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="157.49999999999997" x="78.74999999999999" y="115.00000000000003">App Install­ation</text>
+     <g transform="translate(0 3.2)">
+      <g id="appinstall_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">App Install­ation Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="iaupdate_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IA Update API</text>
+        </g>
+        <g id="task_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Task Plugin API</text>
+        </g>
+        <g id="sw_installer_common_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SW Installer Common UI API</text>
+        </g>
+        <g id="sw_installer_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">SW Installer Launcher API</text>
+        </g>
+        <g id="task_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Task Management API</text>
+        </g>
+        <g id="sw_installer_ui_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">SW Installer UI Plugin API</text>
+        </g>
+        <g id="sw_installer_cr_keys" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">SW Installer CR Keys</text>
+        </g>
+        <g id="sw_installer_ps_keys" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">SW Installer PS Keys</text>
+        </g>
+        <g id="appmngr2runtimeapi" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Application Manager 2 Runtime Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="appinstall_pub" transform="translate(85.79999999999998 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">App Install­ation Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="startup_list_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Startup List Management API</text>
+        </g>
+       </g>
+      </g>
+      <g id="ncdengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Nokia Content Discover</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7811,7 +12340,7 @@
         </g>
        </g>
       </g>
-      <g id="appinstaller" transform="translate(0 37.6)" class="collection">
+      <g id="appinstaller" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">App Installer</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7827,12 +12356,12 @@
         </g>
        </g>
       </g>
-      <g id="iaupdateapi_stub" transform="translate(0 18.8)" class="collection placeholder">
+      <g id="iaupdateapi_stub" transform="translate(103.49999999999999 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IA Update API Stub</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="iaupdate" transform="translate(17.7 18.8)" class="collection">
+      <g id="iaupdate" transform="translate(121.19999999999997 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Independent Apps Update</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7848,7 +12377,7 @@
         </g>
        </g>
       </g>
-      <g id="installationservices" transform="translate(20.700000000000003 37.6)" class="collection">
+      <g id="installationservices" transform="translate(20.700000000000003 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Install­ation Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7870,7 +12399,7 @@
         </g>
        </g>
       </g>
-      <g id="secureswitools" transform="translate(0 75.2)" class="collection">
+      <g id="secureswitools" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Secure SW Install Tools</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7897,7 +12426,7 @@
         </g>
        </g>
       </g>
-      <g id="appinstall_info" transform="translate(38.400000000000006 18.8)" class="collection">
+      <g id="appinstall_info" transform="translate(141.89999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">App Install­ation Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7909,24 +12438,65 @@
         </g>
        </g>
       </g>
-      <g id="appinstall_pub" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">appinstall_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="appinstall_plat" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">appinstall_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="serviceapifw" class="package" transform="translate( 1572.0000000000002 0)">
+     </g>
+    </g>
+    <g id="serviceapifw" class="package" transform="translate( 3148.200000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">Service API Frame­work</text>
-     <g transform="translate(0 3.2)">
-      <g id="rtsecuritymanager" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="83.69999999999999" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="86.2" dy="0.375em">Service API Frame­work</text>
+     <g transform="translate(0 3.2)">
+      <g id="serviceapifw_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Service API FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="rtsecuritymanager_common_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Runtime Security Manager Common API</text>
+        </g>
+        <g id="rtsecuritymanager_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Runtime Security Manager Utility API</text>
+        </g>
+        <g id="rtsecuritymanager_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Runtime Security Manager Client API</text>
+        </g>
+        <g id="liw_provider_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">LIW Provider Utility API</text>
+        </g>
+        <g id="liw_service_interface_base_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">LIW Service Interface Base API</text>
+        </g>
+        <g id="liw_service_interface_menu_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">LIW Service Interface Menu API</text>
+        </g>
+        <g id="liw_criteria_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">LIW Criteria API</text>
+        </g>
+        <g id="liw_generic_parameter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">LIW Generic Parameter API</text>
+        </g>
+        <g id="liw_service_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">LIW Service Handler API</text>
+        </g>
+       </g>
+      </g>
+      <g id="rtsecuritymanager" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Runtime Security Manager</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7947,7 +12517,7 @@
         </g>
        </g>
       </g>
-      <g id="languageinterworkingfw" transform="translate(0 75.2)" class="collection">
+      <g id="languageinterworkingfw" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Language Inter­working FW</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7958,22 +12528,12 @@
         </g>
        </g>
       </g>
-      <g id="serviceapifw_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">serviceapifw_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="serviceapifw_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">serviceapifw_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="serviceapi" class="package" transform="translate( 1607.4000000000003 0)">
+     </g>
+    </g>
+    <g id="serviceapi" class="package" transform="translate( 3234.0000000000014 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="111.59999999999998" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="111.59999999999998" x="55.79999999999999" y="115.00000000000001">Service API</text>
+     <rect class="package" x="0" width="111.59999999999998" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="111.59999999999998" x="55.79999999999999" y="96.2">Service API</text>
      <g transform="translate(0 3.2)">
       <g id="serviceproviders" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="111.59999999999998"/>
@@ -8043,12 +12603,144 @@
       </g>
      </g>
     </g>
-    <g id="web" class="package" transform="translate( 1721.1000000000004 0)">
+    <g id="web" class="package" transform="translate( 3347.700000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="120.89999999999998" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="120.89999999999998" x="60.44999999999999" y="105" dy="0.375em">Web</text>
-     <g transform="translate(0 3.2)">
-      <g id="browserutilities" transform="translate(0 75.2)" class="collection">
+     <rect class="package" x="0" width="301.8" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="301.8" x="150.9" y="86.2" dy="0.375em">Web</text>
+     <g transform="translate(0 3.2)">
+      <g id="web_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Web Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="browser_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Browser Control API</text>
+        </g>
+        <g id="download_mgr_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Download Manager Client API</text>
+        </g>
+        <g id="download_mgr_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Download Manager UI Library API</text>
+        </g>
+        <g id="favourites_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Favourites Engine API</text>
+        </g>
+        <g id="browser_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Browser Plug-in API</text>
+        </g>
+        <g id="settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Settings API</text>
+        </g>
+       </g>
+      </g>
+      <g id="web_plat" transform="translate(57.9 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="167.40000000000003"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="166.00000000000003" height="6.299999999999999">Web Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="browser_platform_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Browser Platform API</text>
+        </g>
+        <g id="aiw_browser_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AIW Browser Provider API</text>
+        </g>
+        <g id="browser_dialogs_provider_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Browser Dialogs Provider API</text>
+        </g>
+        <g id="browser_platform_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Browser Platform API</text>
+        </g>
+        <g id="cod_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">COD Handler API</text>
+        </g>
+        <g id="connection_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Connection Manager API</text>
+        </g>
+        <g id="cxml_library_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">cXml Library API</text>
+        </g>
+        <g id="download_mgr_client_api_extn" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Download Manager Client API Extension</text>
+        </g>
+        <g id="feeds_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Feeds Engine API</text>
+        </g>
+        <g id="launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Launcher API</text>
+        </g>
+        <g id="multipart_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Multipart Parser API</text>
+        </g>
+        <g id="recent_url_store_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Recent URL Store API</text>
+        </g>
+        <g id="scheme_handler_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Scheme Handler Plugin API</text>
+        </g>
+        <g id="scriptable_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Scriptable Plugin API</text>
+        </g>
+        <g id="webutils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Web Utils API</text>
+        </g>
+        <g id="widget_registry_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Widget Registry API</text>
+        </g>
+        <g id="xml_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">XML Parser API</text>
+        </g>
+        <g id="stmgesturefw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">State Machine Gesture Framework API </text>
+        </g>
+       </g>
+      </g>
+      <g id="browserutilities" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="111.59999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="110.19999999999997" height="6.299999999999999">Browser Utilities</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8114,7 +12806,7 @@
         </g>
        </g>
       </g>
-      <g id="webengine" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="webengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="120.89999999999998"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="119.49999999999997" height="6.299999999999999">Web Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8185,7 +12877,7 @@
         </g>
        </g>
       </g>
-      <g id="codhandler" transform="translate(0 18.8)" class="collection">
+      <g id="codhandler" transform="translate(227.40000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Content Object Descriptor Handler</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8231,29 +12923,60 @@
         </g>
        </g>
       </g>
-      <g id="widgets" transform="translate(0 37.6)" class="collection placeholder">
+      <g id="widgets" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Widget Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="web_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">web_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="web_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">web_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="websrv" class="package" transform="translate( 1650.3 119.20000000000002)">
+     </g>
+    </g>
+    <g id="websrv" class="package" transform="translate( 4563.3 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="251.10000000000014" height="134.8" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="251.10000000000014" x="125.55000000000007" y="133.8">Web Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="webservices" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="251.10000000000014" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="251.10000000000014" x="125.55000000000007" y="115.00000000000003">Web Services</text>
+     <g transform="translate(0 3.2)">
+      <g id="websrv_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Web Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="web_service_description_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Web Service Description API</text>
+        </g>
+        <g id="web_service_connection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Web Service Connection API</text>
+        </g>
+        <g id="web_service_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Web Service Manager API</text>
+        </g>
+        <g id="hostlet_connection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Hostlet Connection API</text>
+        </g>
+        <g id="web_service_messaging_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Web Service Messaging API</text>
+        </g>
+        <g id="xml_extensions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">XML Extensions API</text>
+        </g>
+        <g id="xml_fragment_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">XML Fragment API</text>
+        </g>
+       </g>
+      </g>
+      <g id="webservices" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="251.10000000000014"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="249.70000000000013" height="6.299999999999999">Web Services Fmwk.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8394,17 +13117,12 @@
         </g>
        </g>
       </g>
-      <g id="websrv_pub" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">websrv_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="platformtools" class="package" transform="translate( 1903.5 119.20000000000002)">
+     </g>
+    </g>
+    <g id="platformtools" class="package" transform="translate( 4816.5 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="134.8" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="133.8">Platform Tools</text>
+     <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Platform Tools</text>
      <g transform="translate(0 3.2)">
       <g id="gfxconversion" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -8424,22 +13142,49 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 1844.1000000000004 0)">
+    <g id="uitools" class="package" transform="translate( 3651.6000000000013 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="68.7" height="116.00000000000001" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="115.00000000000001">UI Tools</text>
-     <g transform="translate(0 3.2)">
-      <g id="cdlcompilertoolkit" transform="translate(0 75.2)" class="collection placeholder">
+     <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
+     <g transform="translate(0 3.2)">
+      <g id="uitools_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">UI Tools Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="third_party_bitmap_palette_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Third Party Bitmap Palette API</text>
+        </g>
+       </g>
+      </g>
+      <g id="uitools_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">UI Tools Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="cdl_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">CDL API</text>
+        </g>
+        <g id="layout_system_private_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Layout System Private API</text>
+        </g>
+       </g>
+      </g>
+      <g id="cdlcompilertoolkit" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">CDL Compiler Toolkit</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="cdlcompiler" transform="translate(17.7 75.2)" class="collection placeholder">
+      <g id="cdlcompiler" transform="translate(17.7 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">CDL Compiler</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="gfxtools" transform="translate(0 37.6)" class="collection">
+      <g id="gfxtools" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Graphics Tools</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8455,12 +13200,12 @@
         </g>
        </g>
       </g>
-      <g id="aknlayoutcompiler" transform="translate(35.4 75.2)" class="collection placeholder">
+      <g id="aknlayoutcompiler" transform="translate(35.4 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Avkon Layout Compiler</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="skincompiler" transform="translate(53.099999999999994 75.2)" class="collection">
+      <g id="skincompiler" transform="translate(53.099999999999994 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Skin Compiler</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8471,12 +13216,12 @@
         </g>
        </g>
       </g>
-      <g id="reszip" transform="translate(0 56.400000000000006)" class="collection placeholder">
+      <g id="reszip" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Resource Zip</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="svgtencoder" transform="translate(17.7 56.400000000000006)" class="collection">
+      <g id="svgtencoder" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SVGT Encoder</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8487,33 +13232,50 @@
         </g>
        </g>
       </g>
-      <g id="uitools_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">uitools_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="uitools_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">uitools_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
    </g>
   </g>
  </g>
  <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
-  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="212.46"/>
-  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="212.46" height="9.3" x="-106.53">Applications</text>
-  <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="2009.1" height="212.46"/>
+  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="189.43"/>
+  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="189.43" height="9.3" x="-95.015">Applications</text>
+  <g class="layer-detail" transform="translate(804.9499999999989 3.2)">
+   <rect x="-792.149999999999" class="layer" y="-3.2" width="4844.4" height="189.43"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="95.1" height="101.43" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="95.1" x="47.55" y="100.43">Location Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="basiclocationinfodisplay" transform="translate(0 75.2)" class="collection">
+     <rect class="package" x="0" width="107.1" height="97.2" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="107.1" x="53.55" y="96.2">Location Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="loc_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location Apps Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="location_centre_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Centre API</text>
+        </g>
+       </g>
+      </g>
+      <g id="loc_pub" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Location Apps Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="landmarks_ui_selector_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Landmarks UI Selector API</text>
+        </g>
+        <g id="landmarks_ui_addedit_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Landmarks UI Add/Edit API</text>
+        </g>
+       </g>
+      </g>
+      <g id="basiclocationinfodisplay" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Basic Location Info Display</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8524,7 +13286,7 @@
         </g>
        </g>
       </g>
-      <g id="landmarksui" transform="translate(0 37.6)" class="collection">
+      <g id="landmarksui" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Land­marks UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8560,7 +13322,7 @@
         </g>
        </g>
       </g>
-      <g id="eventsui" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="eventsui" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Location Events UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8596,32 +13358,32 @@
         </g>
        </g>
       </g>
-      <g id="locationlandmarksrefappfors60" transform="translate(0 18.8)" class="collection placeholder">
+      <g id="locationlandmarksrefappfors60" transform="translate(38.400000000000006 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Land­marks Ref App for S60</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationlandmarksuirefapp" transform="translate(17.7 18.8)" class="collection placeholder">
+      <g id="locationlandmarksuirefapp" transform="translate(56.10000000000001 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Land­marks UI Ref App</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationsatviewrefapp" transform="translate(35.4 18.8)" class="collection placeholder">
+      <g id="locationsatviewrefapp" transform="translate(73.80000000000001 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Satellite View Ref App</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="simpsyconfigurator" transform="translate(17.7 75.2)" class="collection placeholder">
+      <g id="simpsyconfigurator" transform="translate(17.7 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Simula­tion PSY Config­urator</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mapnavproviderrefapp" transform="translate(53.099999999999994 18.8)" class="collection placeholder">
+      <g id="mapnavproviderrefapp" transform="translate(91.5 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Map &amp; Nav Provider Ref App</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationcentre" transform="translate(57.9 37.6)" class="collection">
+      <g id="locationcentre" transform="translate(57.9 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Location Centre</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8647,24 +13409,35 @@
         </g>
        </g>
       </g>
-      <g id="loc_pub" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">loc_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="loc_plat" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">loc_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="mmsharinguis" class="package" transform="translate( 0 104.63000000000001)">
+     </g>
+    </g>
+    <g id="mmsharinguis" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="55.8" height="101.43" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="100.42999999999999">Multi­media Sharing UIs</text>
-     <g transform="translate(0 3.2)">
-      <g id="mmsharing" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="55.8" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="81.63000000000002">Multi­media Sharing UIs</text>
+     <g transform="translate(0 3.2)">
+      <g id="mmsharinguis_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">MM Sharing UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="multimedia_sharing_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Multimedia Sharing Settings API</text>
+        </g>
+        <g id="multimedia_sharing_resource_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Multimedia Sharing Resource API</text>
+        </g>
+        <g id="multimedia_sharing_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Multimedia Sharing Manager API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mmsharing" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Multi­media Sharing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8700,7 +13473,7 @@
         </g>
        </g>
       </g>
-      <g id="mmshplugins" transform="translate(0 37.6)" class="collection">
+      <g id="mmshplugins" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">MM Sharing Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8731,19 +13504,105 @@
         </g>
        </g>
       </g>
-      <g id="mmsharinguis_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">mmsharinguis_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="phone" class="package" transform="translate( 97.19999999999999 0)">
+     </g>
+    </g>
+    <g id="phone" class="package" transform="translate( 109.19999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="83.69999999999999" height="206.06" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="205.06">Phone Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="phoneapp" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="243.9" height="183.03" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="243.9" x="121.95" y="182.03">Phone Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="phone_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="158.10000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="156.70000000000002" height="6.299999999999999">Phone Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="3d_ringing_tone_enabler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">3D Ringing Tone Enabler API</text>
+        </g>
+        <g id="telephony_comms_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Telephony Comms Information API</text>
+        </g>
+        <g id="telephony_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Telephony Information API</text>
+        </g>
+        <g id="telephony_device_mode_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Telephony Device Mode API</text>
+        </g>
+        <g id="telephony_remote_party_information_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Telephony Remote Party Information API</text>
+        </g>
+        <g id="telephony_video_mailbox_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Telephony Video Mailbox Settings API</text>
+        </g>
+        <g id="telephony_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Telephony Configuration API</text>
+        </g>
+        <g id="telephony_microphone_mute_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Telephony Microphone Mute Status API</text>
+        </g>
+        <g id="dialer_keypad_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Dialer Keypad API</text>
+        </g>
+        <g id="telephony_logging_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Telephony Logging Extension API</text>
+        </g>
+        <g id="telephony_matching_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Telephony Matching Extension API</text>
+        </g>
+        <g id="telephony_bubble_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Telephony Bubble Extension API</text>
+        </g>
+        <g id="telephony_menu_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Telephony Menu Extension API</text>
+        </g>
+        <g id="phone_application_commands_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Phone Application Commands API</text>
+        </g>
+        <g id="phone_application_voip_commands_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Phone Application VOIP Commands API</text>
+        </g>
+        <g id="telephony_mediator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Telephony Mediator API</text>
+        </g>
+        <g id="video_telephony_mediator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Video Telephony Mediator API</text>
+        </g>
+       </g>
+      </g>
+      <g id="phoneapp" transform="translate(160.20000000000002 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Phone App</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8794,7 +13653,7 @@
         </g>
        </g>
       </g>
-      <g id="phoneengine" transform="translate(0 75.2)" class="collection">
+      <g id="phoneengine" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Phone Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8840,7 +13699,7 @@
         </g>
        </g>
       </g>
-      <g id="phonesettings" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="phonesettings" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Phone Settings</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8856,7 +13715,7 @@
         </g>
        </g>
       </g>
-      <g id="phoneuis" transform="translate(0 37.6)" class="collection">
+      <g id="phoneuis" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Phone UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8897,7 +13756,7 @@
         </g>
        </g>
       </g>
-      <g id="phoneplugins" transform="translate(20.700000000000003 56.400000000000006)" class="collection">
+      <g id="phoneplugins" transform="translate(20.700000000000003 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Phone Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8908,19 +13767,30 @@
         </g>
        </g>
       </g>
-      <g id="phone_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">phone_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="videotelephony" class="package" transform="translate( 182.99999999999997 0)">
+     </g>
+    </g>
+    <g id="videotelephony" class="package" transform="translate( 355.20000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Video Telephony Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="vtengines" transform="translate(0 75.2)" class="collection">
+     <rect class="package" x="0" width="36.300000000000004" height="97.2" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="96.2">Video Telephony Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="videotelephony_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">VT Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="video_telephony_control_mediator_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Telephony Control Mediator API</text>
+        </g>
+        <g id="video_telephony_media_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Video Telephony Media Configuration API</text>
+        </g>
+       </g>
+      </g>
+      <g id="vtengines" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Video Telephony Engines</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8936,7 +13806,7 @@
         </g>
        </g>
       </g>
-      <g id="vtuis" transform="translate(0 18.8)" class="collection">
+      <g id="vtuis" transform="translate(20.700000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Telephony UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8947,7 +13817,7 @@
         </g>
        </g>
       </g>
-      <g id="vtprotocolplugins" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="vtprotocolplugins" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">VT Protocol Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -8963,23 +13833,54 @@
         </g>
        </g>
       </g>
-      <g id="vtprotocolsstub" transform="translate(0 37.6)" class="collection placeholder">
+      <g id="vtprotocolsstub" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">VT Protocols Stub</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="videotelephony_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">videotelephony_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="iptelephony" class="package" transform="translate( 212.99999999999997 0)">
+     </g>
+    </g>
+    <g id="iptelephony" class="package" transform="translate( 393.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="110.69999999999997" height="101.43" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="110.69999999999997" x="55.34999999999999" y="100.43">IP Telephony</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="110.69999999999997" height="97.2" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="65.09999999999997" x="78.14999999999999" y="86.2" dy="0.375em">IP Telephony</text>
+     <g transform="translate(0 3.2)">
+      <g id="iptel_plat" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">IP Telephony Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="richcallsettingsengine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Rich Call Settings Engine API</text>
+        </g>
+        <g id="cch_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">CCH Client API</text>
+        </g>
+        <g id="cch_server_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">CCH Server API</text>
+        </g>
+        <g id="csc_settingsui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">CSC Settings UI API</text>
+        </g>
+        <g id="vccpropertyhandler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">VCC Property Handler API</text>
+        </g>
+        <g id="vcc_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">VCC API</text>
+        </g>
+       </g>
+      </g>
       <g id="convergedconnectionhandler" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Con­verged Conn. Handler</text>
@@ -9140,19 +14041,30 @@
         </g>
        </g>
       </g>
-      <g id="iptel_plat" transform="translate(48.6 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">iptel_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="settingsuis" class="package" transform="translate( 182.99999999999997 104.63000000000001)">
+     </g>
+    </g>
+    <g id="settingsuis" class="package" transform="translate( 355.20000000000005 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
-     <rect class="package" x="0" width="37.2" height="101.43" y="0" style="fill:darkseagreen;"/>
-     <text text-anchor="middle" class="package" width="37.2" x="18.6" y="100.42999999999999">Settings UIs</text>
-     <g transform="translate(0 3.2)">
-      <g id="defaultapplicationsettings" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="37.2" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
+     <text text-anchor="middle" class="package" width="37.2" x="18.6" y="81.63000000000002">Settings UIs</text>
+     <g transform="translate(0 3.2)">
+      <g id="devmngt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Settings UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="default_app_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Default App Client API</text>
+        </g>
+        <g id="services_db_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Services DB API</text>
+        </g>
+       </g>
+      </g>
+      <g id="defaultapplicationsettings" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Default App Settings</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9178,7 +14090,7 @@
         </g>
        </g>
       </g>
-      <g id="systemswuis" transform="translate(0 18.8)" class="collection">
+      <g id="systemswuis" transform="translate(20.700000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">System SW UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9189,29 +14101,50 @@
         </g>
        </g>
       </g>
-      <g id="devmngt_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">devmngt_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="devmngt_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">devmngt_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="contentcontrol" class="package" transform="translate( 222.29999999999998 104.63000000000001)">
+     </g>
+    </g>
+    <g id="contentcontrol" class="package" transform="translate( 394.50000000000006 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:darkseagreen;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.42999999999999">Content Control Daemons</text>
-     <g transform="translate(0 3.2)">
-      <g id="dsdcmoadapter" transform="translate(0 37.6)" class="collection placeholder">
+     <rect class="package" x="0" width="67.19999999999999" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
+     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="81.63000000000002">Content Control Daemons</text>
+     <g transform="translate(0 3.2)">
+      <g id="contentctrl_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Content Control Daemons Platforn Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="oma_ds_presync_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">OMA DS PreSync Plugin API</text>
+        </g>
+        <g id="ds_agenda_handler_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">DS Agenda Handler Plugin API</text>
+        </g>
+        <g id="ds_folder_util_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">DS Folder Util API</text>
+        </g>
+        <g id="adapter_customization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Adapter Customization API</text>
+        </g>
+        <g id="ds_data_modification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">DS Data Modification API</text>
+        </g>
+       </g>
+      </g>
+      <g id="dsdcmoadapter" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Data Sync DCMO Adapter</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="omads" transform="translate(0 18.8)" class="collection">
+      <g id="omads" transform="translate(48.6 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">OMA Data Sync</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9227,17 +14160,12 @@
         </g>
        </g>
       </g>
-      <g id="contentctrl_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">contentctrl_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="devicecontrol" class="package" transform="translate( 252.29999999999998 104.63000000000001)">
+     </g>
+    </g>
+    <g id="devicecontrol" class="package" transform="translate( 463.80000000000007 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
-     <rect class="package" x="0" width="101.39999999999998" height="101.43" y="0" style="fill:darkseagreen;"/>
-     <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="100.42999999999999">Dev­ice Control Daemons</text>
+     <rect class="package" x="0" width="101.39999999999998" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
+     <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="81.63000000000002">Dev­ice Control Daemons</text>
      <g transform="translate(0 3.2)">
       <g id="devicediagnostics" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
@@ -9392,10 +14320,10 @@
       </g>
      </g>
     </g>
-    <g id="printing" class="package" transform="translate( 355.79999999999995 104.63000000000001)">
+    <g id="printing" class="package" transform="translate( 567.3000000000001 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.42999999999999">Printing</text>
+     <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Printing</text>
      <g transform="translate(0 3.2)">
       <g id="imageprint" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -9420,12 +14348,23 @@
       </g>
      </g>
     </g>
-    <g id="files" class="package" transform="translate( 325.79999999999995 0)">
+    <g id="files" class="package" transform="translate( 506.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="67.19999999999999" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="100.43">File Manager Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="deviceencryption" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="67.19999999999999" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="96.2">File Manager Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="files_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">File Manager Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="memory_scan_popup_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Memory Scan Popup UI API</text>
+        </g>
+       </g>
+      </g>
+      <g id="deviceencryption" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Device Encryption</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9456,12 +14395,12 @@
         </g>
        </g>
       </g>
-      <g id="filemanager" transform="translate(0 18.8)" class="collection placeholder">
+      <g id="filemanager" transform="translate(17.7 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">File Manager</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="filesystemuis" transform="translate(48.6 37.6)" class="collection">
+      <g id="filesystemuis" transform="translate(48.6 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">File System UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9477,17 +14416,12 @@
         </g>
        </g>
       </g>
-      <g id="files_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">files_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="utils" class="package" transform="translate( 395.0999999999999 0)">
+     </g>
+    </g>
+    <g id="utils" class="package" transform="translate( 575.6999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Utility Apps</text>
+     <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Utility Apps</text>
      <g transform="translate(0 3.2)">
       <g id="extras" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -9512,12 +14446,299 @@
       </g>
      </g>
     </g>
-    <g id="contacts" class="package" transform="translate( 425.0999999999999 0)">
+    <g id="contacts" class="package" transform="translate( 605.6999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="64.2" height="206.06" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="64.2" x="32.1" y="205.06">Contacts Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="contactextensions" transform="translate(0 37.6)" class="collection">
+     <rect class="package" x="0" width="579.0000000000003" height="183.03" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="579.0000000000003" x="289.50000000000017" y="182.03">Contacts Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="contacts_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Contacts Apps Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="phonebook_fetch_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Phonebook Fetch UI API</text>
+        </g>
+        <g id="phonebook_data_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Phonebook Data Management API</text>
+        </g>
+        <g id="phonebook_vcard_importexport_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Phonebook vCard Import/Export API</text>
+        </g>
+        <g id="phonebook_data_addedit_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Phonebook Data Add/Edit UI API</text>
+        </g>
+        <g id="phonebook_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Phonebook UI Utilities API</text>
+        </g>
+        <g id="phonebook_thumbnail_operation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Phonebook Thumbnail Operation API</text>
+        </g>
+        <g id="speed_dial_utility_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Speed Dial Utility Control API</text>
+        </g>
+       </g>
+      </g>
+      <g id="contacts_plat" transform="translate(67.19999999999999 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="446.4000000000004"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="445.0000000000004" height="6.299999999999999">Contacts Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="virtual_phonebook_store_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Virtual Phonebook Store API</text>
+        </g>
+        <g id="virtual_phonebook_sim_services_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Virtual Phonebook SIM Services API</text>
+        </g>
+        <g id="virtual_phonebook_configuration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Virtual Phonebook Configuration API</text>
+        </g>
+        <g id="virtual_phonebook_copy_policy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Virtual Phonebook Copy Policy API</text>
+        </g>
+        <g id="virtual_phonebook_policy_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Virtual Phonebook Policy API</text>
+        </g>
+        <g id="virtual_phonebook_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Virtual Phonebook Engine API</text>
+        </g>
+        <g id="virtual_phonebook_migration_support_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Virtual Phonebook Migration Support API</text>
+        </g>
+        <g id="virtual_phonebook_view_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Virtual Phonebook View Definition API</text>
+        </g>
+        <g id="virtual_phonebook_vcard_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Virtual Phonebook vCard API</text>
+        </g>
+        <g id="cms_contactor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">CMS Contactor API</text>
+        </g>
+        <g id="contactpresence_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Contact Presence API</text>
+        </g>
+        <g id="presence_cache_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Presence Cache API</text>
+        </g>
+        <g id="phonebook_internal_common_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Phonebook Internal Common API</text>
+        </g>
+        <g id="phonebook_internal_appfw_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Phonebook Internal App Framework API</text>
+        </g>
+        <g id="phonebook_internal_data_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Phonebook Internal Data Management API</text>
+        </g>
+        <g id="phonebook_2_xsp_extension_manager_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Phonebook 2 xSP Extension Manager API</text>
+        </g>
+        <g id="phonebook_ui_controls_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Phonebook UI Controls API</text>
+        </g>
+        <g id="phonebook_2_image_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Phonebook 2 Image Management API</text>
+        </g>
+        <g id="phonebook_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Phonebook Extension API</text>
+        </g>
+        <g id="phonebook_public_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Phonebook Public Constants API</text>
+        </g>
+        <g id="phonebook_internal_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Phonebook Internal UI Utilities API</text>
+        </g>
+        <g id="logs_engine_api_extensions" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Logs Engine API Extensions</text>
+        </g>
+        <g id="phonebook_thumbnails_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Phonebook Thumbnails API</text>
+        </g>
+        <g id="phonebook_2_icon_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Phonebook 2 Icon API</text>
+        </g>
+        <g id="phonebook_engine_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Phonebook Engine Extension API</text>
+        </g>
+        <g id="phonebook_2_store_configuration_management_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Phonebook 2 Store Configuration Management API</text>
+        </g>
+        <g id="logs_ui_command_line_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Logs UI Command Line API</text>
+        </g>
+        <g id="speed_dial_dialogs_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Speed Dial Dialogs API</text>
+        </g>
+        <g id="phonebook_2_xsp_view_activation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="260.40000000000015" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="265.0500000000001">Phonebook 2 xSP View Activation API</text>
+        </g>
+        <g id="logs_timers_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="269.70000000000016" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="274.35000000000014">Logs Timers API</text>
+        </g>
+        <g id="phonebook_2_ui_extension_definition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="279.00000000000017" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="283.65000000000015">Phonebook 2 UI Extension Definition API</text>
+        </g>
+        <g id="phonebook_2_common_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="288.3000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="292.95000000000016">Phonebook 2 Common UI API</text>
+        </g>
+        <g id="phonebook_2_ui_extension_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="297.6000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="302.25000000000017">Phonebook 2 UI Extension API</text>
+        </g>
+        <g id="phonebook_2_store_property_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="306.9000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="311.5500000000002">Phonebook 2 Store Property API</text>
+        </g>
+        <g id="phonebook_2_ui_extension_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="316.2000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="320.8500000000002">Phonebook 2 UI Extension Plug-In API</text>
+        </g>
+        <g id="phonebook_2_ui_controls_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="325.5000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="330.1500000000002">Phonebook 2 UI Controls API</text>
+        </g>
+        <g id="phonebook_2_thin_ui_extension_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="334.80000000000024" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="339.4500000000002">Phonebook 2 Thin UI Extension Plugin API</text>
+        </g>
+        <g id="phonebook_2_commands_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="344.10000000000025" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="348.7500000000002">Phonebook 2 Commands API</text>
+        </g>
+        <g id="phonebook_2_presentation_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="353.40000000000026" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="358.05000000000024">Phonebook 2 Presentation API</text>
+        </g>
+        <g id="phonebook_2_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="362.7000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="367.35000000000025">Phonebook 2 UI Utilities API</text>
+        </g>
+        <g id="phonebook_2_contact_related_icon_customization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="372.0000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">Phonebook 2 Contact Related Icon Customization API</text>
+        </g>
+        <g id="cca_launch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="381.3000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">CCA Launch API</text>
+        </g>
+        <g id="cca_view_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="390.6000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">CCA View Plugin API</text>
+        </g>
+        <g id="predictivesearch_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="399.9000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Predictive Search Client API</text>
+        </g>
+        <g id="predictivesearch_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="409.20000000000033" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Predictive Search Utils API</text>
+        </g>
+        <g id="predictivesearch_adapters_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="418.50000000000034" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">Predictive Search Adapters API</text>
+        </g>
+        <g id="predictivesearch_algorithm_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="427.80000000000035" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Predictive Search Algorithm API</text>
+        </g>
+        <g id="phonebook_2_rcl_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="437.10000000000036" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="441.75000000000034">Phonebook 2 RCL API</text>
+        </g>
+       </g>
+      </g>
+      <g id="contactextensions" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Contacts Exten­sions</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9528,12 +14749,12 @@
         </g>
        </g>
       </g>
-      <g id="logsui" transform="translate(0 18.8)" class="collection placeholder">
+      <g id="logsui" transform="translate(515.7000000000004 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Logs UI</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="phonebookui" transform="translate(17.7 18.8)" class="collection">
+      <g id="phonebookui" transform="translate(533.4000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Phone­book UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9554,7 +14775,7 @@
         </g>
        </g>
       </g>
-      <g id="phonebookengines" transform="translate(0 75.2)" class="collection">
+      <g id="phonebookengines" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Phone­book Engines</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9580,7 +14801,7 @@
         </g>
        </g>
       </g>
-      <g id="pimprotocols" transform="translate(17.7 37.6)" class="collection">
+      <g id="pimprotocols" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">PIM Protocols</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9596,7 +14817,7 @@
         </g>
        </g>
       </g>
-      <g id="ccservices" transform="translate(38.400000000000006 37.6)" class="collection">
+      <g id="ccservices" transform="translate(38.400000000000006 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Contacts Centric Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9607,12 +14828,12 @@
         </g>
        </g>
       </g>
-      <g id="presencecache" transform="translate(0 56.400000000000006)" class="collection placeholder">
+      <g id="presencecache" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Presence Cache</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="predictivesearch" transform="translate(17.7 56.400000000000006)" class="collection">
+      <g id="predictivesearch" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Predictive Search</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9643,7 +14864,7 @@
         </g>
        </g>
       </g>
-      <g id="contacts_info" transform="translate(47.7 18.8)" class="collection">
+      <g id="contacts_info" transform="translate(563.4000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Contacts Apps Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9655,24 +14876,136 @@
         </g>
        </g>
       </g>
-      <g id="contacts_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">contacts_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="contacts_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">contacts_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="organizer" class="package" transform="translate( 491.3999999999999 0)">
+     </g>
+    </g>
+    <g id="organizer" class="package" transform="translate( 1186.8000000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="218.1" height="206.06" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="218.1" x="109.05" y="205.06">Organizer App Suite</text>
-     <g transform="translate(0 3.2)">
-      <g id="alarmengines" transform="translate(0 56.400000000000006)" class="collection">
+     <rect class="package" x="0" width="289.80000000000007" height="183.03" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="289.80000000000007" x="144.90000000000003" y="182.03">Organizer App Suite</text>
+     <g transform="translate(0 3.2)">
+      <g id="organizer_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="186.00000000000006"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="184.60000000000005" height="6.299999999999999">Organizer App Suite Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="meeting_request_mailbox_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Meeting Request Mailbox Utilities API</text>
+        </g>
+        <g id="meeting_request_uids_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Meeting Request UIDs API</text>
+        </g>
+        <g id="calendar_exporter_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Calendar Exporter API</text>
+        </g>
+        <g id="agenda_versit_2_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Agenda Versit 2 API</text>
+        </g>
+        <g id="calendar_importer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Calendar Importer API</text>
+        </g>
+        <g id="calendar_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Calendar Launcher API</text>
+        </g>
+        <g id="calendar_common_utils_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Calendar Common Utils API</text>
+        </g>
+        <g id="searchfw_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Search Framework Launcher API</text>
+        </g>
+        <g id="alarm_const_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Alarm Const API</text>
+        </g>
+        <g id="alarm_ui_external_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Alarm UI External Control API</text>
+        </g>
+        <g id="calendar_settings_keys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Calendar Settings Keys API</text>
+        </g>
+        <g id="calendar_tones_settings_keys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Calendar Tones Settings Keys API</text>
+        </g>
+        <g id="clock_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Clock Settings API</text>
+        </g>
+        <g id="common_alarm_editor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Common Alarm Editor API</text>
+        </g>
+        <g id="alarm_ui_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Alarm UI Secondary Display API</text>
+        </g>
+        <g id="searchui_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Search UI Launcher API</text>
+        </g>
+        <g id="agenda_entry_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Agenda Entry UI API</text>
+        </g>
+        <g id="meeting_request_utillities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Meeting Request Utillities API</text>
+        </g>
+        <g id="meeting_request_viewer_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Meeting Request Viewer API</text>
+        </g>
+        <g id="calendar_custamization_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Calendar Customization API</text>
+        </g>
+       </g>
+      </g>
+      <g id="organizer_pub" transform="translate(188.10000000000005 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Organizer App Suite Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="calendar_interim_utils2_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Calendar Interim Utils 2 API</text>
+        </g>
+        <g id="notepad_library_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Notepad Library API</text>
+        </g>
+       </g>
+      </g>
+      <g id="alarmengines" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Alarm Engines</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9683,7 +15016,7 @@
         </g>
        </g>
       </g>
-      <g id="calendarengines" transform="translate(17.7 56.400000000000006)" class="collection">
+      <g id="calendarengines" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Calendar Engines</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9719,7 +15052,7 @@
         </g>
        </g>
       </g>
-      <g id="meetingrequestengines" transform="translate(75.6 56.400000000000006)" class="collection">
+      <g id="meetingrequestengines" transform="translate(75.6 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Meeting Request Engines</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9735,17 +15068,17 @@
         </g>
        </g>
       </g>
-      <g id="searchfw" transform="translate(0 75.2)" class="collection placeholder">
+      <g id="searchfw" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Search Frame­work</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="alarmui" transform="translate(0 18.8)" class="collection placeholder">
+      <g id="alarmui" transform="translate(208.80000000000004 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Alarm UI</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="calendarui" transform="translate(0 37.6)" class="collection">
+      <g id="calendarui" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="148.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="147.4" height="6.299999999999999">Calendar UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9831,7 +15164,7 @@
         </g>
        </g>
       </g>
-      <g id="meetingui" transform="translate(150.9 37.6)" class="collection">
+      <g id="meetingui" transform="translate(150.9 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Meeting UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9857,7 +15190,7 @@
         </g>
        </g>
       </g>
-      <g id="clock2" transform="translate(17.7 18.8)" class="collection">
+      <g id="clock2" transform="translate(226.50000000000006 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Clock</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9878,7 +15211,7 @@
         </g>
        </g>
       </g>
-      <g id="notepad" transform="translate(190.2 37.6)" class="collection">
+      <g id="notepad" transform="translate(190.2 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Notepad</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9899,12 +15232,12 @@
         </g>
        </g>
       </g>
-      <g id="searchui" transform="translate(47.7 18.8)" class="collection placeholder">
+      <g id="searchui" transform="translate(256.50000000000006 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Search UI</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="pimappservices" transform="translate(17.7 75.2)" class="collection">
+      <g id="pimappservices" transform="translate(17.7 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">PIM App Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9926,7 +15259,7 @@
         </g>
        </g>
       </g>
-      <g id="pimappsupport" transform="translate(0 94)" class="collection">
+      <g id="pimappsupport" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">PIM App Support</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9942,7 +15275,7 @@
         </g>
        </g>
       </g>
-      <g id="organizer_info" transform="translate(65.4 18.8)" class="collection">
+      <g id="organizer_info" transform="translate(274.20000000000005 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Organizer App Suite Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9954,24 +15287,161 @@
         </g>
        </g>
       </g>
-      <g id="organizer_pub" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">organizer_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="organizer_plat" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">organizer_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="messaging" class="package" transform="translate( 711.5999999999999 0)">
+     </g>
+    </g>
+    <g id="messaging" class="package" transform="translate( 1478.7000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="130.2" height="206.06" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="130.2" x="65.1" y="205.06">Messag­ing Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="mobilemessaging" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="356.7000000000001" height="183.03" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="182.03">Messag­ing Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="msg_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Msg. Apps Public APIs</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="messaging_integration_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Messaging Integration API</text>
+        </g>
+        <g id="plugin_bio_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Plug-in Bio Control API</text>
+        </g>
+        <g id="mms_client_mtm_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">MMS Client MTM API</text>
+        </g>
+        <g id="open_new_message_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Open New Message Notification API</text>
+        </g>
+        <g id="messaging_editor_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Messaging Editor Constants API</text>
+        </g>
+       </g>
+      </g>
+      <g id="msg_plat" transform="translate(48.6 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="204.60000000000008"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="203.20000000000007" height="6.299999999999999">Msg. Apps Platform APIs</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="smil_player_launch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">SMIL Player Launch API</text>
+        </g>
+        <g id="messaging_media_resolver_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Messaging Media Resolver API</text>
+        </g>
+        <g id="smil_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SMIL Engine API</text>
+        </g>
+        <g id="mms_server_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">MMS Server Settings API</text>
+        </g>
+        <g id="new_contacts_note_secondary_display_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">New Contacts Note Secondary Display API</text>
+        </g>
+        <g id="messaging_center_ui_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Messaging Center UI Utilities API</text>
+        </g>
+        <g id="internet_mail_mtm_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Internet Mail MTM UI API</text>
+        </g>
+        <g id="messaging_editor_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Messaging Editor API</text>
+        </g>
+        <g id="email_domain_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Email Domain Utilities API</text>
+        </g>
+        <g id="smil_transition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">SMIL Transition API</text>
+        </g>
+        <g id="new_contacts_note_status_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">New Contacts Note Status API</text>
+        </g>
+        <g id="unified_editor_video_conversion_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Unified Editor Video Conversion API</text>
+        </g>
+        <g id="mms_conformance_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">MMS Conformance API</text>
+        </g>
+        <g id="new_contacts_note_variables_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">New Contacts Note Variables API</text>
+        </g>
+        <g id="new_message_notification_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">New Message Notification API</text>
+        </g>
+        <g id="mms_application_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">MMS Application API</text>
+        </g>
+        <g id="mms_engine_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">MMS Engine Settings API</text>
+        </g>
+        <g id="mms_codec_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">MMS Codec Client API</text>
+        </g>
+        <g id="send_ui_meeting_request_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Send UI Meeting Request API</text>
+        </g>
+        <g id="new_contact_notes_extended_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">New Contact Notes Extended API</text>
+        </g>
+        <g id="mail_ui_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Mail UI Constants API</text>
+        </g>
+        <g id="sim_dialog_launch_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">SIM Dialog Launch API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mobilemessaging" transform="translate(255.30000000000007 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Mobile Messag­ing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10022,7 +15492,7 @@
         </g>
        </g>
       </g>
-      <g id="mmsengine" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="mmsengine" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">MMS Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10038,7 +15508,7 @@
         </g>
        </g>
       </g>
-      <g id="messagingappbase" transform="translate(0 37.6)" class="collection">
+      <g id="messagingappbase" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">Messag­ing App Base</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10114,7 +15584,7 @@
         </g>
        </g>
       </g>
-      <g id="email" transform="translate(0 75.2)" class="collection">
+      <g id="email" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Email</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10150,7 +15620,7 @@
         </g>
        </g>
       </g>
-      <g id="messaging_info" transform="translate(85.79999999999998 18.8)" class="collection">
+      <g id="messaging_info" transform="translate(341.1000000000001 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Messag­ing Apps Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10162,24 +15632,46 @@
         </g>
        </g>
       </g>
-      <g id="msg_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">msg_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="msg_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">msg_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="commonemail" class="package" transform="translate( 843.8999999999999 0)">
+     </g>
+    </g>
+    <g id="commonemail" class="package" transform="translate( 1837.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="148.8" height="206.06" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="148.8" x="74.4" y="205.06">Email Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="emailservices" transform="translate(0 75.2)" class="collection">
+     <rect class="package" x="0" width="148.8" height="183.03" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="148.8" x="74.4" y="182.03">Email Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="email_pub" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Email Apps Public Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="email_widget_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Email Widget API</text>
+        </g>
+       </g>
+      </g>
+      <g id="email_plat" transform="translate(17.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Email Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="email_client_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Email Client API</text>
+        </g>
+        <g id="email_setup_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Email Setup Plugin API</text>
+        </g>
+        <g id="email_crkeys_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Email CenRep Keys API</text>
+        </g>
+       </g>
+      </g>
+      <g id="emailservices" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Email Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10225,7 +15717,7 @@
         </g>
        </g>
       </g>
-      <g id="ipsservices" transform="translate(76.49999999999999 75.2)" class="collection">
+      <g id="ipsservices" transform="translate(76.49999999999999 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">IMAP/POP/SMTP Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10246,7 +15738,7 @@
         </g>
        </g>
       </g>
-      <g id="emailcontacts" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="emailcontacts" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Email Contacts</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10267,7 +15759,7 @@
         </g>
        </g>
       </g>
-      <g id="meetingrequest" transform="translate(0 37.6)" class="collection">
+      <g id="meetingrequest" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="148.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="147.4" height="6.299999999999999">Meeting Request</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10353,7 +15845,7 @@
         </g>
        </g>
       </g>
-      <g id="emailuis" transform="translate(0 18.8)" class="collection">
+      <g id="emailuis" transform="translate(47.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Email UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10374,34 +15866,45 @@
         </g>
        </g>
       </g>
-      <g id="email_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">email_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="email_pub" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">email_pub</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="conversations" class="package" transform="translate( 994.7999999999998 0)">
+     </g>
+    </g>
+    <g id="conversations" class="package" transform="translate( 1988.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="76.5" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="76.5" x="38.25" y="100.43">Conversa­tion Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="uiservicetabsettings" transform="translate(0 75.2)" class="collection placeholder">
+     <rect class="package" x="0" width="106.50000000000001" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="106.50000000000001" x="53.25000000000001" y="96.2">Conversa­tion Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="conversations_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Conversa­tion Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="im_cv_launcher_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">IM CV Launcher API</text>
+        </g>
+        <g id="im_connection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">IM Connection API</text>
+        </g>
+        <g id="im_cv_appui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">IM CV App UI API</text>
+        </g>
+       </g>
+      </g>
+      <g id="uiservicetabsettings" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">UI Service Tab Settings</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="instantmessagesalert" transform="translate(0 56.400000000000006)" class="collection placeholder">
+      <g id="instantmessagesalert" transform="translate(0 37.6)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Instant Messages Alert</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imstutils" transform="translate(17.7 56.400000000000006)" class="collection">
+      <g id="imstutils" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">IM Service Tab Utils</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10427,7 +15930,7 @@
         </g>
        </g>
       </g>
-      <g id="uiservicetab" transform="translate(0 18.8)" class="collection">
+      <g id="uiservicetab" transform="translate(30.000000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">UI Service Tab</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10463,7 +15966,7 @@
         </g>
        </g>
       </g>
-      <g id="servicewidget" transform="translate(57.9 18.8)" class="collection">
+      <g id="servicewidget" transform="translate(87.9 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Service Widget</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10479,63 +15982,86 @@
         </g>
        </g>
       </g>
-      <g id="instantmsgindicatorplugin" transform="translate(0 37.6)" class="collection placeholder">
+      <g id="instantmsgindicatorplugin" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Instant Message Indicator Plugin</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="imstatuspaneindicatorplugin" transform="translate(17.7 37.6)" class="collection placeholder">
+      <g id="imstatuspaneindicatorplugin" transform="translate(17.7 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IM Status Pane Indicator Plugin</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="conversations_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">conversations_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="im" class="package" transform="translate( 1073.3999999999996 0)">
+     </g>
+    </g>
+    <g id="im" class="package" transform="translate( 2097.0000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Instant Msg. Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="wvsettings20" transform="translate(0 75.2)" class="collection placeholder">
+     <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Instant Msg. Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="im_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Instant Msg. Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wv_sap_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">WV SAP Settings API</text>
+        </g>
+       </g>
+      </g>
+      <g id="wvsettings20" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Wireless Village Settings Eng.</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="im_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">im_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="dictionary" class="package" transform="translate( 994.7999999999998 104.63000000000001)">
+     </g>
+    </g>
+    <g id="dictionary" class="package" transform="translate( 1988.4000000000005 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.42999999999999">Dictio­nary</text>
-     <g transform="translate(0 3.2)">
-      <g id="userdict" transform="translate(0 18.8)" class="collection placeholder">
+     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Dictio­nary</text>
+     <g transform="translate(0 3.2)">
+      <g id="dictionary_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Dictio­nary Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="menu_suites_macros_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Menu Suites Macros API</text>
+        </g>
+       </g>
+      </g>
+      <g id="userdict" transform="translate(17.7 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">User Dictio­nary</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="dictionary_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">dictionary_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="camera" class="package" transform="translate( 1103.3999999999996 0)">
+     </g>
+    </g>
+    <g id="camera" class="package" transform="translate( 2127.0000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="36.300000000000004" height="101.43" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="100.43">Camera Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="camerauis" transform="translate(0 0)" class="collection">
+     <rect class="package" x="0" width="39.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="96.2">Camera Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="camera_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Camera Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="camcorder_ui_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Camcorder UI Constants API</text>
+        </g>
+        <g id="active_palette_2_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Active Palette 2 API</text>
+        </g>
+       </g>
+      </g>
+      <g id="camerauis" transform="translate(20.700000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Camera UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10551,19 +16077,45 @@
         </g>
        </g>
       </g>
-      <g id="camera_plat" transform="translate(20.700000000000003 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">camera_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="imgeditor" class="package" transform="translate( 1141.7999999999997 0)">
+     </g>
+    </g>
+    <g id="imgeditor" class="package" transform="translate( 2168.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="65.1" height="101.43" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="100.43">Image Editor Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="imageeditor" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="113.69999999999999" height="97.2" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Image Editor Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="imgeditor_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Image Editor Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="image_editor_debug_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Image Editor Debug Utilities API</text>
+        </g>
+        <g id="image_editor_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Image Editor Utilities API</text>
+        </g>
+        <g id="image_editor_definitions_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Image Editor Definitions API</text>
+        </g>
+        <g id="image_editor_system_parameters_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Image Editor System Parameters API</text>
+        </g>
+        <g id="image_processing_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Image Processing Engine API</text>
+        </g>
+       </g>
+      </g>
+      <g id="imageeditor" transform="translate(48.6 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Image Editor UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10604,7 +16156,7 @@
         </g>
        </g>
       </g>
-      <g id="imageeditorengine" transform="translate(0 37.6)" class="collection">
+      <g id="imageeditorengine" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Image Editor Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10630,19 +16182,25 @@
         </g>
        </g>
       </g>
-      <g id="imgeditor_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">imgeditor_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="videoeditor" class="package" transform="translate( 1208.9999999999998 0)">
+     </g>
+    </g>
+    <g id="videoeditor" class="package" transform="translate( 2284.2000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="55.8" height="101.43" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="100.43">Video Editor Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="videditor" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="64.2" height="97.2" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="64.2" x="32.1" y="96.2">Video Editor Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="videoeditor_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Editor Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="video_editor_engine_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Engine API</text>
+        </g>
+       </g>
+      </g>
+      <g id="videditor" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Video Editor</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10673,7 +16231,7 @@
         </g>
        </g>
       </g>
-      <g id="videoeditorengine" transform="translate(0 37.6)" class="collection">
+      <g id="videoeditorengine" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Video Editor Engine</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10709,18 +16267,34 @@
         </g>
        </g>
       </g>
-      <g id="videoeditor_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">videoeditor_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="videoplayer" class="package" transform="translate( 1266.8999999999999 0)">
+     </g>
+    </g>
+    <g id="videoplayer" class="package" transform="translate( 2350.500000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="206.70000000000002" height="101.43" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="206.70000000000002" x="103.35000000000001" y="100.43">Video Player Apps</text>
-     <g transform="translate(0 3.2)">
+     <rect class="package" x="0" width="206.70000000000002" height="97.2" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="167.4" x="123.00000000000001" y="86.2" dy="0.375em">Video Player Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="videoplayer_plat" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Video Player Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="videoplayer_startup_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Player Startup API</text>
+        </g>
+        <g id="video_player_file_details_dialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Media Player File Details Dialog API</text>
+        </g>
+        <g id="videocollection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Video Collection API</text>
+        </g>
+       </g>
+      </g>
       <g id="videofeeds" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="167.40000000000003"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="166.00000000000003" height="6.299999999999999">Video Feeds</text>
@@ -10875,7 +16449,7 @@
         </g>
        </g>
       </g>
-      <g id="videoplayerapp" transform="translate(0 18.8)" class="collection">
+      <g id="videoplayerapp" transform="translate(30.000000000000004 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Video Player App</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10969,19 +16543,45 @@
         </g>
        </g>
       </g>
-      <g id="videoplayer_plat" transform="translate(60.00000000000001 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">videoplayer_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="photos" class="package" transform="translate( 1475.6999999999998 0)">
+     </g>
+    </g>
+    <g id="photos" class="package" transform="translate( 2559.300000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="130.2" height="101.43" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="130.2" x="65.1" y="100.43">Photos</text>
-     <g transform="translate(0 3.2)">
-      <g id="photosgallery" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="178.79999999999998" height="97.2" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="178.79999999999998" x="89.39999999999999" y="96.2">Photos</text>
+     <g transform="translate(0 3.2)">
+      <g id="photos_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Photos Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="collection_plugins_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Collection Plugins API</text>
+        </g>
+        <g id="controllers_collection_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Controllers Collection API</text>
+        </g>
+        <g id="gallery_utilities_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Gallery Utilities API</text>
+        </g>
+        <g id="slideshow_ui_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Slideshow Ui Constants API</text>
+        </g>
+        <g id="views_metadatadialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Views Metadata Dialog API</text>
+        </g>
+       </g>
+      </g>
+      <g id="photosgallery" transform="translate(48.6 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">Photos Gallery</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11057,19 +16657,65 @@
         </g>
        </g>
       </g>
-      <g id="photos_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">photos_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="musicplayer" class="package" transform="translate( 1607.9999999999998 0)">
+     </g>
+    </g>
+    <g id="musicplayer" class="package" transform="translate( 2740.200000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="46.5" height="101.43" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="46.5" x="23.25" y="100.43">Music Player Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="mpxmusicplayer" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="132.29999999999998" height="97.2" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="132.29999999999998" x="66.14999999999999" y="96.2">Music Player Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="musicplayer_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Music Player Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="mpx_music_player_app_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">MPX Music Player App API</text>
+        </g>
+        <g id="mpx_music_player_commonui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">MPX Music Player Common UI API</text>
+        </g>
+        <g id="mpx_music_player_media_key_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">MPX Music Player Media Key Handler API</text>
+        </g>
+        <g id="mpx_music_player_remote_control_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">MPX Music Player Remote Control API</text>
+        </g>
+        <g id="mpx_music_shop_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">MPX Music Shop UI API</text>
+        </g>
+        <g id="mpx_music_wap_adapter_cenrep_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">MPX Music Wap Adapter CenRep API</text>
+        </g>
+        <g id="mpx_music_store_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">MPX Music Store Find API</text>
+        </g>
+        <g id="audio_application_features_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Audio Application Features API</text>
+        </g>
+        <g id="music_content_publisher_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Music Content Publisher Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="mpxmusicplayer" transform="translate(85.79999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">MPX Music Player</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11100,12 +16746,12 @@
         </g>
        </g>
       </g>
-      <g id="musichomescreen_multiview" transform="translate(0 37.6)" class="collection placeholder">
+      <g id="musichomescreen_multiview" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Music Home Screen Multiview</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mpxplugins" transform="translate(0 75.2)" class="collection">
+      <g id="mpxplugins" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">MPX Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11121,17 +16767,12 @@
         </g>
        </g>
       </g>
-      <g id="musicplayer_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">musicplayer_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="radio" class="package" transform="translate( 1656.5999999999997 0)">
+     </g>
+    </g>
+    <g id="radio" class="package" transform="translate( 2874.6000000000013 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="55.8" height="101.43" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="100.43">Radio Apps</text>
+     <rect class="package" x="0" width="55.8" height="97.2" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="55.8" x="27.9" y="96.2">Radio Apps</text>
      <g transform="translate(0 3.2)">
       <g id="fmradio" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
@@ -11171,35 +16812,67 @@
       </g>
      </g>
     </g>
-    <g id="voicerec" class="package" transform="translate( 1714.4999999999998 0)">
+    <g id="voicerec" class="package" transform="translate( 2932.5000000000014 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Voice Recorder Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="voicerecorder" transform="translate(0 0)" class="collection placeholder">
+     <rect class="package" x="0" width="36.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="96.2">Voice Recorder Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="voicerec_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Voice Recorder Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="new_file_service_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">New File Service API</text>
+        </g>
+        <g id="voicerecorder_public_constants_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Voice Recorder Public Constants API</text>
+        </g>
+       </g>
+      </g>
+      <g id="voicerecorder" transform="translate(20.700000000000003 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice Recorder</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="voicerec_plat" transform="translate(17.7 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">voicerec_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="screensaver" class="package placeholder" transform="translate( 1749.8999999999999 0)">
+     </g>
+    </g>
+    <g id="screensaver" class="package placeholder" transform="translate( 2970.9000000000015 0)">
+     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
+     <rect class="package" x="0" width="78" height="97.2" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="45.03">Screen Saver Apps</text>
+     <g transform="translate(0 3.2)"/>
+    </g>
+    <g id="homescreen" class="package" transform="translate( 3051.0000000000014 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="78" height="101.43" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="49.715" dy="0.375em" height="45.03">Screen Saver Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="homescreen" class="package" transform="translate( 1829.9999999999998 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="83.69999999999999" height="101.43" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="100.43">Home Screen Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="idlehomescreen" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="113.69999999999999" height="97.2" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Home Screen Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="homescreen_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Home Screen Apps Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="menu_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Menu Settings API</text>
+        </g>
+        <g id="hs_content_control_ui" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HS Content Control Ui</text>
+        </g>
+        <g id="hs_renderingplugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HS Rendering Plugin API</text>
+        </g>
+       </g>
+      </g>
+      <g id="idlehomescreen" transform="translate(30.000000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Idle Home Screen</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11250,7 +16923,7 @@
         </g>
        </g>
       </g>
-      <g id="menufw" transform="translate(0 56.400000000000006)" class="collection">
+      <g id="menufw" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Menu Frame­work</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11271,7 +16944,7 @@
         </g>
        </g>
       </g>
-      <g id="taskswitcher" transform="translate(0 37.6)" class="collection">
+      <g id="taskswitcher" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Task Switcher</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11287,19 +16960,35 @@
         </g>
        </g>
       </g>
-      <g id="homescreen_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">homescreen_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="graphicsuis" class="package" transform="translate( 1024.7999999999997 104.63000000000001)">
+     </g>
+    </g>
+    <g id="graphicsuis" class="package" transform="translate( 2023.8000000000006 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.42999999999999">Graphics UIs</text>
-     <g transform="translate(0 3.2)">
-      <g id="svgtviewer" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="45.6" height="82.63000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="45.6" x="22.8" y="81.63000000000002">Graphics UIs</text>
+     <g transform="translate(0 3.2)">
+      <g id="graphicsuis_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Graphics UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="svgt_viewer_ui_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">SVG-T Viewer UI API</text>
+        </g>
+        <g id="svg_application_observer_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">SVG Application Observer Utility API</text>
+        </g>
+        <g id="svgt_file_view_details_dialog_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SVG-T File View Details Dialog API</text>
+        </g>
+       </g>
+      </g>
+      <g id="svgtviewer" transform="translate(30.000000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SVG-T Viewer</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11310,19 +16999,25 @@
         </g>
        </g>
       </g>
-      <g id="graphicsuis_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">graphicsuis_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="profile" class="package" transform="translate( 1915.7999999999997 0)">
+     </g>
+    </g>
+    <g id="profile" class="package" transform="translate( 3166.8000000000015 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="101.43" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="100.43">Profiles</text>
-     <g transform="translate(0 3.2)">
-      <g id="profilesapplication" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Profiles</text>
+     <g transform="translate(0 3.2)">
+      <g id="profile_plat" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Profiles Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="profiles_settings_view_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Profiles Settings View API</text>
+        </g>
+       </g>
+      </g>
+      <g id="profilesapplication" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Profiles App</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11333,24 +17028,160 @@
         </g>
        </g>
       </g>
-      <g id="profile_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">profile_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="help" transform="translate(17.7 0)" class="collection placeholder">
+      <g id="help" transform="translate(0 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">help</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
      </g>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 1054.7999999999997 104.63000000000001)">
+    <g id="speechsrv" class="package" transform="translate( 2071.5000000000005 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="186.00000000000006" height="101.43" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="186.00000000000006" x="93.00000000000003" y="100.42999999999999">Speech Recog­nition UIs</text>
-     <g transform="translate(0 3.2)">
-      <g id="voiceui" transform="translate(0 18.8)" class="collection">
+     <rect class="package" x="0" width="290.40000000000015" height="82.63000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="290.40000000000015" x="145.20000000000007" y="81.63000000000002">Speech Recog­nition UIs</text>
+     <g transform="translate(0 3.2)">
+      <g id="speechsrv_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="251.10000000000014"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="249.70000000000013" height="6.299999999999999">Speech Recog­nition UIs Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="vas_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">VAS API</text>
+        </g>
+        <g id="nss_devasr_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">NSS DevASR API</text>
+        </g>
+        <g id="tts_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">TTS HW Device API</text>
+        </g>
+        <g id="voice_commands_resource_header_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Voice Commands Resource Header API</text>
+        </g>
+        <g id="nss_mmf_tts_custom_commands_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">NSS MMF TTS Custom Commands API</text>
+        </g>
+        <g id="srsf_cenrep_settings_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">SRSF CenRep Settings API</text>
+        </g>
+        <g id="voice_ui_plugin_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Voice UI Plug-in API</text>
+        </g>
+        <g id="nss_tts_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">NSS TTS Utility API</text>
+        </g>
+        <g id="nss_srs_custom_commands_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">NSS SRS Custom Commands API</text>
+        </g>
+        <g id="srsf_secondarydisplay_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">SRSF Secondary Display API</text>
+        </g>
+        <g id="asrs_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">ASRS Hardware Device API</text>
+        </g>
+        <g id="vas_vcommand_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">VAS Voice Command API</text>
+        </g>
+        <g id="adaptation_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Adaptation Hardware Device API</text>
+        </g>
+        <g id="nss_devtts_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">NSS DevTTS API</text>
+        </g>
+        <g id="nss_srs_utility_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">NSS SRS Utility API</text>
+        </g>
+        <g id="recognition_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Recognition Hardware Device API</text>
+        </g>
+        <g id="vas_contact_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">VAS Contact Handler API</text>
+        </g>
+        <g id="nlp_hw_device" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">NLP Hardware Device</text>
+        </g>
+        <g id="nss_si_speech_recognition_data_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">NSS SI Speech Recognition Data API</text>
+        </g>
+        <g id="nss_tts_common_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">NSS TTS Common API</text>
+        </g>
+        <g id="grcompiler_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Grammar Compiler Hardware Device API</text>
+        </g>
+        <g id="ttp_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="195.30000000000007" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">TTP Hardware Device API</text>
+        </g>
+        <g id="vocman_hw_device_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="204.60000000000008" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">VocMan Hardware Device API</text>
+        </g>
+        <g id="speech_synthesis_clientserver_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="213.9000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Speech Synthesis Client-Server API</text>
+        </g>
+        <g id="voice_ui_accessory_button_handling_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="223.2000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="227.8500000000001">Voice UI Accessory Button Handling API</text>
+        </g>
+        <g id="ui_voice_recognition_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">UI Voice Recognition API</text>
+        </g>
+        <g id="vcommand_settings_cenrep_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Voice Command Settings CenRep API</text>
+        </g>
+       </g>
+      </g>
+      <g id="voiceui" transform="translate(253.20000000000013 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Voice UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11376,7 +17207,7 @@
         </g>
        </g>
       </g>
-      <g id="srsf" transform="translate(0 37.6)" class="collection">
+      <g id="srsf" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="186.00000000000006"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="184.60000000000005" height="6.299999999999999">Speech Recog­nition &amp; Synthesis FW</text>
        <g transform="translate(0 6.299999999999999)">
@@ -11482,17 +17313,12 @@
         </g>
        </g>
       </g>
-      <g id="speechsrv_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">speechsrv_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="homescreentools" class="package" transform="translate( 1242.8999999999999 104.63000000000001)">
+     </g>
+    </g>
+    <g id="homescreentools" class="package" transform="translate( 2364.0000000000005 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="54" height="101.43" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="54" x="27" y="100.42999999999999">Home Screen Tools</text>
+     <rect class="package" x="0" width="54" height="82.63000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="54" x="27" y="81.63000000000002">Home Screen Tools</text>
      <g transform="translate(0 3.2)">
       <g id="dtdinstaller" transform="translate(0 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -11522,10 +17348,10 @@
       </g>
      </g>
     </g>
-    <g id="webuis" class="package" transform="translate( 1298.9999999999998 104.63000000000001)">
+    <g id="webuis" class="package" transform="translate( 2420.1000000000004 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="36.300000000000004" height="101.43" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="100.42999999999999">Web UIs</text>
+     <rect class="package" x="0" width="36.300000000000004" height="82.63000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="81.63000000000002">Web UIs</text>
      <g transform="translate(0 3.2)">
       <g id="browserui" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -11577,27 +17403,38 @@
       </g>
      </g>
     </g>
-    <g id="jrt" class="package" transform="translate( 1337.3999999999999 104.63000000000001)">
+    <g id="jrt" class="package" transform="translate( 2458.5000000000005 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.42999999999999">Java Runtime</text>
-     <g transform="translate(0 3.2)">
-      <g id="java_stubs" transform="translate(0 75.2)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Java Stubs</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="jrt_plat" transform="translate(0 0)" class="collection placeholder">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">jrt_plat</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="conntools" class="package" transform="translate( 1367.3999999999999 104.63000000000001)">
+     <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
+     <g transform="translate(0 3.2)">
+      <g id="jrt_plat" transform="translate(0 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">JRT Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="java_registry_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Java Registry API</text>
+        </g>
+        <g id="java_env_info_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Java Environment Info API</text>
+        </g>
+        <g id="java_debug_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Java Debug API</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="conntools" class="package" transform="translate( 2488.5000000000005 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.42999999999999">Connect­ivity Tools</text>
+     <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Connect­ivity Tools</text>
      <g transform="translate(0 3.2)">
       <g id="nettools" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -11618,10 +17455,10 @@
       </g>
      </g>
     </g>
-    <g id="rndtools" class="package" transform="translate( 1397.3999999999999 104.63000000000001)">
+    <g id="rndtools" class="package" transform="translate( 2518.5000000000005 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="84.9" height="101.43" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="84.9" x="42.45" y="100.42999999999999">R&amp;D tools</text>
+     <rect class="package" x="0" width="84.9" height="82.63000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="84.9" x="42.45" y="81.63000000000002">R&amp;D tools</text>
      <g transform="translate(0 3.2)">
       <g id="creator" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -11713,10 +17550,10 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 1951.1999999999998 0)">
+    <g id="helps" class="package" transform="translate( 3202.2000000000016 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="206.06" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="205.06">Help Apps</text>
+     <rect class="package" x="0" width="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Help Apps</text>
      <g transform="translate(0 3.2)">
       <g id="csxhelp" transform="translate(0 18.8)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -11748,10 +17585,10 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 1981.1999999999998 0)">
+    <g id="techview" class="package" transform="translate( 3232.2000000000016 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="27.900000000000002" height="206.06" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="205.06">Techview</text>
+     <rect class="package" x="0" width="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Techview</text>
      <g transform="translate(0 3.2)">
       <g id="buildverification" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -11788,7 +17625,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(1724.9795 735.7200000000001) translate(303.3205 0) scale(5.349588966126589) translate(-303.3205)">
+ <g id="legend-root" class="legend" transform="translate(4560.2795 652.0600000000002) translate(303.3205 0) scale(12.827619630061271) translate(-303.3205)">
   <text text-anchor="middle" class="title" x="286.98525" y="0">
    <tspan dy="0.75em" x="286.98525">Symbian OS ^3</tspan>
    <tspan dy="1em" x="286.98525">System Model</tspan>
@@ -11879,7 +17716,7 @@
       <g id="s4-overlay0" class="cmp placeholder">
        <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
        <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (140)</text>
+       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (141)</text>
       </g>
      </g>
     </g>
@@ -11913,8 +17750,8 @@
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
      <tspan dy="-1em" x="250.875">107 Packages</tspan>
-     <tspan dy="1em" x="250.875">608 Collections</tspan>
-     <tspan dy="1em" x="250.875">1400 Components</tspan>
+     <tspan dy="1em" x="250.875">600 Collections</tspan>
+     <tspan dy="1em" x="250.875">2555 Components</tspan>
     </text>
    </g>
   </g>
--- a/symbian3/single/sysdefs/sf3pkg.svg	Thu Mar 18 11:43:11 2010 +0000
+++ b/symbian3/single/sysdefs/sf3pkg.svg	Fri Mar 19 14:46:47 2010 +0000
@@ -734,7 +734,7 @@
     <g id="mmuifw" class="package" transform="translate( 1121.3999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="78" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="78.4">Multi­media UI Fmwk.</text>
+     <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="97.2">Multi­media UI Fmwk.</text>
      <g transform="translate(0 3.2)"/>
     </g>
     <g id="videoutils" class="package" transform="translate( 1201.4999999999998 0)">
@@ -770,7 +770,7 @@
     <g id="inputmethods" class="package" transform="translate( 1201.4999999999998 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="59.6">Input Methods</text>
+     <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="78.4">Input Methods</text>
      <g transform="translate(0 3.2)"/>
     </g>
     <g id="qt" class="package placeholder" transform="translate( 1281.5999999999997 100.4)">
--- a/symbian3/single/sysdefs/system_model.xml	Thu Mar 18 11:43:11 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Fri Mar 19 14:46:47 2010 +0000
@@ -138,7 +138,7 @@
    <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
     <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
      <component name="ubootldr" long-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 name="bsptemplate" long-name="Board Support Package Template" level="hw-if">
@@ -325,6 +325,280 @@
     </collection>
    </block>
    <block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
+    <collection name="ossrv_pub" long-name="Generic OS Services Public Interfaces" level="utilities">
+     <component name="boost_apis" long-name="Boost APIs" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/boost_apis/group"/>
+     </component>
+     <component name="cpp_wrappers" long-name="Cpp wrappers" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/cpp_wrappers/group"/>
+     </component>
+     <component name="character_type_apis" long-name="Character Type APIs" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/character_type_apis/group"/>
+     </component>
+     <component name="compiler_specific_runtime_support" long-name="Compiler Specific Runtime Support" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/compiler_specific_runtime_support/group"/>
+     </component>
+     <component name="ossrv_configuration_api" long-name="Generic OS Services Configuration API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/configuration/group"/>
+     </component>
+     <component name="crypto_authentication_codes_and_hash_functions_api" long-name="Crypto Authentication Codes and Hash Functions API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/crypto_authentication_codes_and_hash_functions_api/group"/>
+     </component>
+     <component name="crypto_auxillary_functions_api" long-name="Crypto Auxillary Functions API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/crypto_auxillary_functions_api/group"/>
+     </component>
+     <component name="crypto_certificates_api" long-name="Crypto Certificates API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/crypto_certificates_api/group"/>
+     </component>
+     <component name="crypto_inputoutput_and_data_encoding_api" long-name="Crypto Input/Output and Data Encoding API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/crypto_inputoutput_and_data_encoding_api/group"/>
+     </component>
+     <component name="crypto_public_key_cryptography_and_key_agreement_api" long-name="Crypto Public Key Cryptography and Key Agreement API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/crypto_public_key_cryptography_and_key_agreement_api/group"/>
+     </component>
+     <component name="crypto_symmetric_ciphers_api" long-name="Crypto Symmetric Ciphers API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/crypto_symmetric_ciphers_api/group"/>
+     </component>
+     <component name="crypto_utility_functions_api" long-name="Crypto Utility Functions API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/crypto_utility_functions_api/group"/>
+     </component>
+     <component name="cryptogaphy_related_api" long-name="Cryptogaphy Related API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/cryptogaphy_related_api/group"/>
+     </component>
+     <component name="ossrv_debug_api" long-name="Generic OS Services Debug API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/debug/group"/>
+     </component>
+     <component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
+     </component>
+     <component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
+     </component>
+     <component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
+     </component>
+     <component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
+     </component>
+     <component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
+     </component>
+     <component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
+     </component>
+     <component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
+     </component>
+     <component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
+     </component>
+     <component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
+     </component>
+     <component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
+     </component>
+     <component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
+     </component>
+     <component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
+     </component>
+     <component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
+     </component>
+     <component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
+     </component>
+     <component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
+     </component>
+     <component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
+     </component>
+     <component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
+     </component>
+     <component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
+     </component>
+     <component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
+     </component>
+     <component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
+     </component>
+     <component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
+     </component>
+     <component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
+     </component>
+     <component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
+     </component>
+     <component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
+     </component>
+     <component name="glib_internationalization" long-name="Glib  Internationalization API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
+     </component>
+     <component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
+     </component>
+     <component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
+     </component>
+     <component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
+     </component>
+     <component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
+     </component>
+     <component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
+     </component>
+     <component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
+     </component>
+     <component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
+     </component>
+     <component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
+     </component>
+     <component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
+     </component>
+     <component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
+     </component>
+     <component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
+     </component>
+     <component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
+     </component>
+     <component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
+     </component>
+     <component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
+     </component>
+     <component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
+     </component>
+     <component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
+     </component>
+     <component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
+     </component>
+     <component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
+     </component>
+     <component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
+     </component>
+     <component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
+     </component>
+     <component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
+     </component>
+     <component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
+     </component>
+     <component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
+     </component>
+     <component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
+     </component>
+     <component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
+     </component>
+     <component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
+     </component>
+     <component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
+     </component>
+     <component name="gobject" long-name="GObject API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
+     </component>
+     <component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
+     </component>
+     <component name="gtype" long-name="GType API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
+     </component>
+     <component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
+     </component>
+     <component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
+     </component>
+     <component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
+     </component>
+     <component name="localization_function_api" long-name="Localization Function API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/localization_function_api/group"/>
+     </component>
+     <component name="math_operations_api" long-name="Math Operations API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/math_operations_api/group"/>
+     </component>
+     <component name="ossrv_memory_api" long-name="Generic OS Services Memory API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/memory/group"/>
+     </component>
+     <component name="no_namespace_headers" long-name="No Namespace Headers" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/no_namespace_headers/group"/>
+     </component>
+     <component name="openc_headers" long-name="OpenC headers" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/openc_headers/group"/>
+     </component>
+     <component name="openc_wrappers" long-name="OpenC wrappers" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/openc_wrappers/group"/>
+     </component>
+     <component name="ssl_general_api" long-name="SSL General API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/ssl_general_api/group"/>
+     </component>
+     <component name="ssl_protocol_methods_api" long-name="SSL Protocol Methods API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/ssl_protocol_methods_api/group"/>
+     </component>
+     <component name="standard_compressiondecompression_api" long-name="Standard Compression/Decompression API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/standard_compressiondecompression_api/group"/>
+     </component>
+     <component name="stl" long-name="STL API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/stl/group"/>
+     </component>
+     <component name="thread_api" long-name="Thread API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/thread_api/group"/>
+     </component>
+     <component name="type_attributes" long-name="Type Attributes API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/type_attributes/group"/>
+     </component>
+     <component name="typeinfo" long-name="Type Info API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/typeinfo/group"/>
+     </component>
+     <component name="utility_apis" long-name="Utility APIs" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/utility_apis/group"/>
+     </component>
+     <component name="wide_character_classapis" long-name="Wide character class/apis" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/wide_character_classapis/group"/>
+     </component>
+     <component name="dbus_api" long-name="Dbus API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/dbus/group"/>
+     </component>
+     <component name="dbus-glib" long-name="Dbus-glib API" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_pub/dbus-glib/group"/>
+     </component>
+    </collection>
+    <collection name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" level="utilities">
+     <component name="libutils_apis" long-name="Utility Library APIs" filter="s60" class="api">
+      <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
+     </component>
+    </collection>
     <collection name="stdlibs" long-name="Standard Libraries" level="translation">
      <component name="libz" filter="s60" long-name="Z Compression Library">
       <unit bldFile="os/ossrv/stdlibs/libz/group"/>
@@ -343,19 +617,24 @@
     </collection>
     <collection name="glib" long-name="GLib" level="utilities">
      <component name="glibbackend" filter="s60" long-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 name="libglib" filter="s60" long-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 name="libgthread" filter="s60" long-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 name="libgmodule" filter="s60" long-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 name="libgobject" filter="s60" long-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 name="stdcpp" long-name="C++ Standard Library" level="translation">
@@ -424,6 +703,9 @@
      <component name="posixrealtimeextensions" long-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 name="liboil" long-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 name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
      <component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory">
@@ -439,13 +721,7 @@
     <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
      <component name="ossrv_build" filter="s60" long-name="Generic OS Services Build">
       <!-- exports should be moved to individual components -->
-      <unit bldFile="os/ossrv/rom"/>
-     </component>
-     <component name="ossrv_plat" filter="s60" long-name="Generic OS Services Platform Interfaces" class="api">
-      <unit bldFile="os/ossrv/ossrv_plat/libutils/group"/>
-     </component>
-     <component name="ossrv_pub" filter="s60" long-name="Generic OS Services Public Interfaces" class="api">
-      <unit bldFile="os/ossrv/ossrv_pub/group"/>
+      <unit bldFile="os/ossrv/group"/>
      </component>
      <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
@@ -504,6 +780,196 @@
     </collection>
    </block>
    <block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
+     <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
+     </component>
+     <component name="common_platform_security_definitions_api" long-name="Common Platform Security Definitions API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group"/>
+     </component>
+     <component name="feature_discovery_api" long-name="Feature Discovery API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/feature_discovery_api/group"/>
+     </component>
+     <component name="platform_environment_api" long-name="Platform Environment API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/platform_environment_api/group"/>
+     </component>
+     <component name="sensor_channel_api" long-name="Sensor Channel API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_channel_api/group"/>
+     </component>
+     <component name="sensor_definitions_api" long-name="Sensor Definitions API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_definitions_api/group"/>
+     </component>
+     <component name="version_info_api" long-name="Version Info API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/version_info_api/group"/>
+     </component>
+     <component name="accessory_monitoring_api" long-name="Accessory Monitoring API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/accessory_monitoring_api/group"/>
+     </component>
+     <component name="haptics_api" long-name="Haptics API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/haptics_api/group"/>
+     </component>
+     <component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
+     </component>
+     <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/inc/platform_paths.hrh"/>
+     </component>
+    </collection>
+    <collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
+     <component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/configuration_file_parser_api/group"/>
+     </component>
+     <component name="dos_extension_plugin_api" long-name="DOS Extension Plug-In API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_plugin_api/group"/>
+     </component>
+     <component name="mediator_command_initiator_api" long-name="Mediator Command Initiator API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_initiator_api/group"/>
+     </component>
+     <component name="syslangutil_api" long-name="SysLangUtil API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/syslangutil_api/group"/>
+     </component>
+     <component name="wakeup_alarm_api" long-name="Wakeup Alarm API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/wakeup_alarm_api/group"/>
+     </component>
+     <component name="disk_and_memory_level_keys_api" long-name="Disk and Memory Level Keys API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/disk_and_memory_level_keys_api/group"/>
+     </component>
+     <component name="mediator_plugin_api" long-name="Mediator Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_plugin_api/group"/>
+     </component>
+     <component name="headset_status_api" long-name="Headset Status API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/headset_status_api/group"/>
+     </component>
+     <component name="system_startup_extension_plugin_api" long-name="System Startup Extension Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/system_startup_extension_plugin_api/group"/>
+     </component>
+     <component name="sensor_plugin_api" long-name="Sensor Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_plugin_api/group"/>
+     </component>
+     <component name="accessory_api" long-name="Accessory API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_api/group"/>
+     </component>
+     <component name="display_language_definition_api" long-name="Display Language Definition API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/display_language_definition_api/group"/>
+     </component>
+     <component name="mediator_command_responder_api" long-name="Mediator Command Responder API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_command_responder_api/group"/>
+     </component>
+     <component name="accessory_policy_definitions_api" long-name="Accessory Policy Definitions API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_definitions_api/group"/>
+     </component>
+     <component name="hw_settings_api" long-name="Hardware Settings API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/hw_settings_api/group"/>
+     </component>
+     <component name="mediator_domain_definitions_api" long-name="Mediator Domain Definitions API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_domain_definitions_api/group"/>
+     </component>
+     <component name="sensor_extension_api" long-name="Sensor Extension API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_extension_api/group"/>
+     </component>
+     <component name="accessory_plugin_api" long-name="Accessory Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_plugin_api/group"/>
+     </component>
+     <component name="sae_api" long-name="SAE API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/sae_api/group"/>
+     </component>
+     <component name="accessory_control_api" long-name="Accessory Control API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_control_api/group"/>
+     </component>
+     <component name="mediator_static_registration_api" long-name="Mediator Static Registration API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_static_registration_api/group"/>
+     </component>
+     <component name="accessory_key_event_handling_api" long-name="Accessory Key Event Handling API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_key_event_handling_api/group"/>
+     </component>
+     <component name="mediator_notification_api" long-name="Mediator Notification API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_notification_api/group"/>
+     </component>
+     <component name="accessory_policy_utility_api" long-name="Accessory Policy Utility API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_utility_api/group"/>
+     </component>
+     <component name="common_dsy_plugin_api" long-name="Common DSY Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/common_dsy_plugin_api/group"/>
+     </component>
+     <component name="remote_control_extension_api" long-name="Remote Control Extension API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/remote_control_extension_api/group"/>
+     </component>
+     <component name="sensor_channel_filter_api" long-name="Sensor Channel Filter API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_channel_filter_api/group"/>
+     </component>
+     <component name="dos_extension_api" long-name="DOS Extension API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/dos_extension_api/group"/>
+     </component>
+     <component name="accessory_audio_control_api" long-name="Accessory Audio Control API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_audio_control_api/group"/>
+     </component>
+     <component name="mediator_event_consumer_api" long-name="Mediator Event Consumer API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_consumer_api/group"/>
+     </component>
+     <component name="shared_data_api" long-name="Shared Data API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/shared_data_api/group"/>
+     </component>
+     <component name="accessory_settings_api" long-name="Accessory Settings API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_settings_api/group"/>
+     </component>
+     <component name="accessory_bluetooth_control_api" long-name="Accessory Bluetooth Control API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_bluetooth_control_api/group"/>
+     </component>
+     <component name="extended_version_info_api" long-name="Extended Version Info API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_api/group"/>
+     </component>
+     <component name="mediator_event_provider_api" long-name="Mediator Event Provider API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/mediator_event_provider_api/group"/>
+     </component>
+     <component name="tv_out_config_api" long-name="TV Out Config API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/tv_out_config_api/group"/>
+     </component>
+     <component name="tspclientmapper_api" long-name="TSP Client Mapper API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/tspclientmapper_api/group"/>
+     </component>
+     <component name="powersave_api" long-name="Power Save API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_api/group"/>
+     </component>
+     <component name="powersave_definitions_api" long-name="Power Save Definitions API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_definitions_api/group"/>
+     </component>
+     <component name="powersave_plugin_api" long-name="Power Save Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/powersave_plugin_api/group"/>
+     </component>
+     <component name="extended_version_info_plugin_api" long-name="Extended Version Info Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/extended_version_info_plugin_api/group"/>
+     </component>
+     <component name="haptics_plugin_api" long-name="Haptics Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_plugin_api/group"/>
+     </component>
+     <component name="haptics_effect_data_getter_plugin_api" long-name="Haptics Effect Data Getter Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_effect_data_getter_plugin_api/group"/>
+     </component>
+     <component name="haptics_packetizer_plugin_api" long-name="Haptics Packetizer Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/haptics_packetizer_plugin_api/group"/>
+     </component>
+     <component name="tiltcompensation_api" long-name="Tilt Compensation API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/tiltcompensation_api/group"/>
+     </component>
+     <component name="disk_notification_handler_api" long-name="Disk Notification Handler API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/disk_notification_handler_api/group"/>
+     </component>
+     <component name="accessory_policy_usb_audio_api" long-name="Accessory Policy USB Audio API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_usb_audio_api/group"/>
+     </component>
+     <component name="accessory_policy_hdmi_audio_api" long-name="Accessory Policy HDMI Audio API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/accessory_policy_hdmi_audio_api/group"/>
+     </component>
+     <component name="sensor_data_compensator_plugin_api" long-name="Sensor Data Compensator Plugin API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/sensor_data_compensator_plugin_api/group"/>
+     </component>
+     <component name="ddc_access_api" long-name="DDC Access API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/ddc_access_api/group"/>
+     </component>
+     <component name="tv_out_behaviour_api" long-name="TV Out Behaviour API" filter="s60" class="api">
+      <unit bldFile="os/devicesrv/devicesrv_plat/tv_out_behaviour_api/group"/>
+     </component>
+    </collection>
     <collection name="accessoryservices" long-name="Accessory Services" level="framework">
      <component name="accessorymonitor" filter="s60" long-name="Accessory Monitor">
       <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
@@ -681,14 +1147,6 @@
     </collection>
     <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if"/>
     <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-     <component name="devicesrv_plat" filter="s60" long-name="Device Services Platform Interfaces" class="api">
-      <unit bldFile="os/devicesrv/devicesrv_plat/group"/>
-     </component>
-     <component name="devicesrv_pub" filter="s60" long-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 name="devicesrv_metadata" long-name="Device Services Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
      </component>
@@ -715,6 +1173,12 @@
      <component name="cafrecogniserconfig" long-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 name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development">
+      <unit bldFile="os/security/contentmgmt/referencedrmagent/RefTestAgent/group" mrp="os/security/contentmgmt/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
+     </component>
+     <component name="cafstreamingsupport" long-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 name="crypto" long-name="Crypto Libraries" level="libraries">
      <component name="weakcryptospi" long-name="Weak Crypto SPI" filter="gt" introduced="^3" purpose="optional">
@@ -761,6 +1225,10 @@
      <component name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
       <unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
      </component>
+     <component name="rootcertificates" filter="sf_build" long-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 name="asnpkcs" long-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>
@@ -1067,6 +1535,58 @@
     </collection>
    </block>
    <block name="wlan" level="services" long-name="WLAN" levels="hw low mid high tools test">
+    <collection name="wlan_plat" long-name="WLAN Platform Interfaces" level="test">
+     <component name="wlan_dbif_api" long-name="WLAN DBIF API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_dbif_api/group"/>
+     </component>
+     <component name="wlan_hal_api" long-name="WLAN HAL API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_hal_api/group"/>
+     </component>
+     <component name="wlan_management_api" long-name="WLAN Management API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_management_api/group"/>
+     </component>
+     <component name="wlan_device_settings_api" long-name="WLAN Device Settings API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_device_settings_api/group"/>
+     </component>
+     <component name="wlan_control_api" long-name="WLAN Control API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_control_api/group"/>
+     </component>
+     <component name="wlan_hw_initialization_data_api" long-name="WLAN Hardware Initialization Data API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_hw_initialization_data_api/group"/>
+     </component>
+     <component name="wlan_power_save_plugin_api" long-name="WLAN Power Save Plugin API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_power_save_plugin_api/group"/>
+     </component>
+     <component name="wlan_info_api" long-name="WLAN Info API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_info_api/group"/>
+     </component>
+     <component name="wlan_agent_hotspot_plugin_api" long-name="WLAN Agent Hotspot Plug-in API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_agent_hotspot_plugin_api/group"/>
+     </component>
+     <component name="wlan_osa_api" long-name="WLAN OSA API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_osa_api/group"/>
+     </component>
+     <component name="wlan_spia_api" long-name="WLAN SPIA API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_spia_api/group"/>
+     </component>
+     <component name="wlan_hpa_api" long-name="WLAN HPA API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_hpa_api/group"/>
+     </component>
+     <component name="wlan_eapol_plugin_api" long-name="WLAN EAPOL Plugin API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_eapol_plugin_api/group"/>
+     </component>
+     <component name="wlan_generic_plugin_api" long-name="WLAN Generic Plugin API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_generic_plugin_api/group"/>
+     </component>
+     <component name="wlan_aws_plugin_api" long-name="WLAN AWS Plugin API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_plat/wlan_aws_plugin_api/group"/>
+     </component>
+    </collection>
+    <collection name="wlan_pub" long-name="WLAN Public Interfaces" level="test">
+     <component name="wlan_sdk_info_api" long-name="WLAN SDK Info API" filter="s60" class="api">
+      <unit bldFile="os/wlan/wlan_pub/wlan_sdk_info_api/group"/>
+     </component>
+    </collection>
     <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
      <component name="wlanpsmplugin" filter="s60" long-name="WLAN PSM Plugin" plugin="Y">
       <unit bldFile="os/wlan/wlan_bearer/wlanpsmplugin/group"/>
@@ -1090,12 +1610,6 @@
     </collection>
     <collection name="wlanapitest" long-name="WLAN API Tests" level="test"/>
     <collection name="wlan_info" long-name="WLAN Info" level="test">
-     <component name="wlan_pub" filter="s60" long-name="WLAN Public Interfaces" class="api">
-      <unit bldFile="os/wlan/wlan_pub/group"/>
-     </component>
-     <component name="wlan_plat" filter="s60" long-name="WLAN Platform Interfaces" class="api">
-      <unit bldFile="os/wlan/wlan_plat/group"/>
-     </component>
      <component name="wlan_metadata" long-name="WLAN Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
      </component>
@@ -1112,11 +1626,6 @@
       <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
      </component>
     </collection>
-    <collection name="fax" long-name="Fax" level="server">
-     <component name="faxclientandserver" long-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 name="smsprotocols" long-name="SMS Protocols" level="framework">
      <component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
       <unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
@@ -1215,6 +1724,17 @@
     <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if"/>
    </block>
    <block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
+     <component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
+      <unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+     </component>
+     <component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" class="api">
+      <unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
+     </component>
+     <component name="at_command_handler_plugin_api" long-name="AT Command Handler Plugin API" filter="s60" class="api">
+      <unit bldFile="os/bt/bt_plat/at_command_handler_plugin_api/group"/>
+     </component>
+    </collection>
     <collection name="bluetooth" long-name="Bluetooth Core" level="framework">
      <component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
       <unit bldFile="os/bt/bluetooth/btstack" mrp="os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
@@ -1281,15 +1801,17 @@
      </component>
     </collection>
     <collection name="bt_info" long-name="Bluetooth Info" level="app-if">
-     <component name="bt_plat" filter="s60" class="api">
-      <unit bldFile="os/bt/bt_plat/group"/>
-     </component>
      <component name="bt_metadata" long-name="Bluetooth Metadata" introduced="^3" purpose="development" class="config PC">
       <unit mrp="os/bt/bt_info/bt_metadata/bt_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
+     <component name="usb_audio_stream_plugin_api" long-name="USB Audio Stream Plugin API" filter="s60" class="api">
+      <unit bldFile="os/usb/usb_plat/usb_audio_stream_plugin_api/group"/>
+     </component>
+    </collection>
     <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
      <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
     </collection>
@@ -1302,15 +1824,253 @@
      </component>
     </collection>
     <collection name="usb_info" long-name="USB Info" level="app-if">
-     <component name="usb_plat" filter="s60" long-name="USB Platform Interfaces" class="api">
-      <unit bldFile="os/usb/usb_plat/group"/>
-     </component>
      <component name="usb_metadata" long-name="USB Metadata" introduced="^3" purpose="development" class="config PC">
       <unit mrp="os/usb/usb_info/usb_metadata/usb_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+    <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
+     <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
+     </component>
+     <component name="audio_effects_presets_api" long-name="Audio Effects Presets API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_pub/audio_effects_presets_api/group"/>
+     </component>
+     <component name="drm_audio_player_api" long-name="DRM Audio Player API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_pub/drm_audio_player_api/group"/>
+     </component>
+     <component name="multimedia_extension_interfaces_api" long-name="Multimedia Extension Interfaces API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_pub/multimedia_extension_interfaces_api/group"/>
+     </component>
+    </collection>
+    <collection name="mm_plat" long-name="Multimedia Platform Interfaces" level="app-if">
+     <component name="aac_decoder_config_api" long-name="AAC Decoder Config API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/aac_decoder_config_api/group"/>
+     </component>
+     <component name="aac_decoder_config_msg_hdlr_api" long-name="AAC Decoder Config Msg Hdlr API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/aac_decoder_config_msg_hdlr_api/group"/>
+     </component>
+     <component name="aac_decoder_config_proxy_api" long-name="AAC Decoder Config Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/aac_decoder_config_proxy_api/group"/>
+     </component>
+     <component name="added_devsound_control_api" long-name="Added DevSound Control API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/added_devsound_control_api/group"/>
+     </component>
+     <component name="added_devsound_control_msg_hdlr_api" long-name="Added DevSound Control Msg Hdlr API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/added_devsound_control_msg_hdlr_api/group"/>
+     </component>
+     <component name="added_devsound_control_proxy_api" long-name="Added DevSound Control Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/added_devsound_control_proxy_api/group"/>
+     </component>
+     <component name="audio_effects_msg_hdlr_api" long-name="Audio Effects Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/audio_effects_msg_hdlr_api/group"/>
+     </component>
+     <component name="audio_effects_proxy_api" long-name="Audio Effects Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/audio_effects_proxy_api/group"/>
+     </component>
+     <component name="audio_policy_header_api" long-name="Audio Policy Header API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/audio_policy_header_api/group"/>
+     </component>
+     <component name="audio_routing_api" long-name="Audio Routing API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/audio_routing_api/group"/>
+     </component>
+     <component name="audio_routing_msg_hdlr_api" long-name="Audio Routing Msg Hdlr API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/audio_routing_msg_hdlr_api/group"/>
+     </component>
+     <component name="audio_routing_proxy_api" long-name="Audio Routing Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/audio_routing_proxy_api/group"/>
+     </component>
+     <component name="custom_interface_builder_api" long-name="Custom Interface Builder API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/custom_interface_builder_api/group"/>
+     </component>
+     <component name="custom_interface_message_handler_factory_api" long-name="Custom Interface Message Handler Factory API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/custom_interface_message_handler_factory_api/group"/>
+     </component>
+     <component name="custom_interface_proxy_factory_api" long-name="Custom Interface Proxy Factory API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/custom_interface_proxy_factory_api/group"/>
+     </component>
+     <component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
+     </component>
+     <component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+     </component>
+     <component name="display_posting_api" long-name="Display Posting API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
+     </component>
+     <component name="eaac_plus_decoder_interface_api" long-name="eAAC Plus Decoder Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_api/group"/>
+     </component>
+     <component name="eaac_plus_decoder_interface_msg_hdlr_api" long-name="eAAC Plus Decoder Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="eaac_plus_decoder_interface_proxy_api" long-name="eAAC Plus Decoder Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/eaac_plus_decoder_interface_proxy_api/group"/>
+     </component>
+     <component name="error_concealment_interface_api" long-name="Error Concealment Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/error_concealment_interface_api/group"/>
+     </component>
+     <component name="error_concealment_interface_msg_hdlr_api" long-name="Error Concealment Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/error_concealment_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
+     </component>
+     <component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+     </component>
+     <component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group"/>
+     </component>
+     <component name="g711_decoder_interface_msg_hdlr_api" long-name="G711 Decoder Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="g711_decoder_interface_proxy_api" long-name="G711 Decoder Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g711_decoder_interface_proxy_api/group"/>
+     </component>
+     <component name="g711_encoder_interface_api" long-name="G711 Encoder Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_api/group"/>
+     </component>
+     <component name="g711_encoder_interface_msg_hdlr_api" long-name="G711 Encoder Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="g711_encoder_interface_proxy_api" long-name="G711 Encoder Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g711_encoder_interface_proxy_api/group"/>
+     </component>
+     <component name="g729_decoder_interface_api" long-name="G729 Decoder Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_api/group"/>
+     </component>
+     <component name="g729_decoder_interface_msg_hdlr_api" long-name="G729 Decoder Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="g729_decoder_interface_proxy_api" long-name="G729 Decoder Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g729_decoder_interface_proxy_api/group"/>
+     </component>
+     <component name="g729_encoder_interface_api" long-name="G729 Encoder Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_api/group"/>
+     </component>
+     <component name="g729_encoder_interface_proxy_api" long-name="G729 Encoder Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_proxy_api/group"/>
+     </component>
+     <component name="g729_encoder_interface_msg_hdlr_api" long-name="G729 Encoder Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/g729_encoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="global_audio_settings_api" long-name="Global Audio Settings API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/global_audio_settings_api/group"/>
+     </component>
+     <component name="global_audio_settings_definition_api" long-name="Global Audio Settings Definition API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/global_audio_settings_definition_api/group"/>
+     </component>
+     <component name="ilbc_decoder_interface_api" long-name="Ilbc Decoder Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_api/group"/>
+     </component>
+     <component name="ilbc_decoder_interface_msg_hdlr_api" long-name="Ilbc Decoder Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="ilbc_decoder_interface_proxy_api" long-name="Ilbc Decoder Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/ilbc_decoder_interface_proxy_api/group"/>
+     </component>
+     <component name="ilbc_encoder_interface_api" long-name="Ilbc Encoder Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_api/group"/>
+     </component>
+     <component name="ilbc_encoder_interface_msg_hdlr_api" long-name="Ilbc Encoder Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="ilbc_encoder_interface_proxy_api" long-name="Ilbc Encoder Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/ilbc_encoder_interface_proxy_api/group"/>
+     </component>
+     <component name="mdf_plugin_uids" long-name="MDF Plug-in UIDs" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/mdf_plugin_uids/group"/>
+     </component>
+     <component name="multimedia_fourcc_definitions_api" long-name="Multimedia FourCC Definitions API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/multimedia_fourcc_definitions_api/group"/>
+     </component>
+     <component name="nokia_audio_policy_header_api" long-name="Nokia Audio Policy Header API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/nokia_audio_policy_header_api/group"/>
+     </component>
+     <component name="nokia_multimedia_fourcc_definitions_api" long-name="Nokia Multimedia Fourcc Definitions API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/nokia_multimedia_fourcc_definitions_api/group"/>
+     </component>
+     <component name="ra8_decoder_interface_api" long-name="RA8 Decoder Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_api/group"/>
+     </component>
+     <component name="ra8_decoder_interface_msg_hdlr_api" long-name="RA8 Decoder Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
+     </component>
+     <component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
+     </component>
+     <component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group"/>
+     </component>
+     <component name="restricted_audio_output_msg_hdlr_api" long-name="Restricted Audio Output Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/restricted_audio_output_msg_hdlr_api/group"/>
+     </component>
+     <component name="restricted_audio_output_proxy_api" long-name="Restricted Audio Output Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/restricted_audio_output_proxy_api/group"/>
+     </component>
+     <component name="sbc_encoder_interface_api" long-name="SBC Encoder Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_api/group"/>
+     </component>
+     <component name="sbc_encoder_interface_msg_hdlr_api" long-name="SBC Encoder Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="sbc_encoder_interface_proxy_api" long-name="SBC Encoder Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/sbc_encoder_interface_proxy_api/group"/>
+     </component>
+     <component name="secure_output_mdf_custom_interface" long-name="Secure Output MDF Custom Interface" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/secure_output_mdf_custom_interface/group"/>
+     </component>
+     <component name="speech_encoder_config_api" long-name="Speech Encoder Config API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/speech_encoder_config_api/group"/>
+     </component>
+     <component name="speech_encoder_config_msg_hdlr_api" long-name="Speech Encoder Config Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/speech_encoder_config_msg_hdlr_api/group"/>
+     </component>
+     <component name="speech_encoder_config_proxy_api" long-name="Speech Encoder Config Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/speech_encoder_config_proxy_api/group"/>
+     </component>
+     <component name="telephony_audio_routing_client_api" long-name="Telephony Audio Routing Client API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/telephony_audio_routing_client_api/group"/>
+     </component>
+     <component name="telephony_audio_routing_manager_api" long-name="Telephony Audio Routing Manager API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/telephony_audio_routing_manager_api/group"/>
+     </component>
+     <component name="video_buffer_management_mdf_custom_interface" long-name="Video Buffer Management MDF Custom Interface" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/video_buffer_management_mdf_custom_interface/group"/>
+     </component>
+     <component name="video_decoder_rotation_mdf_custom_interface" long-name="Video Decoder Rotation MDF Custom Interface" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/video_decoder_rotation_mdf_custom_interface/group"/>
+     </component>
+     <component name="video_decoder_scaling_mdf_custom_interface" long-name="Video Decoder Scaling MDF Custom Interface" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/video_decoder_scaling_mdf_custom_interface/group"/>
+     </component>
+     <component name="video_reclaim_extbuffers_ci" long-name="Video Reclaim Extbuffers Custom Interface" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/video_reclaim_extbuffers_ci/group"/>
+     </component>
+     <component name="video_window_control_custom_interface" long-name="Video Window Control Custom Interface" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/video_window_control_custom_interface/group"/>
+     </component>
+     <component name="wma_decoder_interface_api" long-name="WMA Decoder Interface API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_api/group"/>
+     </component>
+     <component name="wma_decoder_interface_msg_hdlr_api" long-name="WMA Decoder Interface Message Handler API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_msg_hdlr_api/group"/>
+     </component>
+     <component name="wma_decoder_interface_proxy_api" long-name="WMA Decoder Interface Proxy API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/wma_decoder_interface_proxy_api/group"/>
+     </component>
+     <component name="eaacplusutil_api" long-name="EAac Plus Util API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/eaacplusutil_api/group"/>
+     </component>
+     <component name="frametable_api" long-name="Frametable API" filter="s60" class="api">
+      <unit bldFile="os/mm/mm_plat/frametable_api/group"/>
+     </component>
+    </collection>
     <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
      <component name="drmaudioplayer" filter="s60" long-name="DRM Audio Player">
       <unit bldFile="os/mm/devsoundextensions/drmaudioplayer/group"/>
@@ -1397,12 +2157,6 @@
      </component>
     </collection>
     <collection name="mm_info" long-name="Multimedia Info" level="app-if">
-     <component name="mm_plat" filter="s60" long-name="Multimedia Platform Interfaces" class="api">
-      <unit bldFile="os/mm/mm_plat/group"/>
-     </component>
-     <component name="mm_pub" filter="s60" long-name="Multimedia Public Interfaces" class="api">
-      <unit bldFile="os/mm/mm_pub/group"/>
-     </component>
      <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc">
       <unit mrp="os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
      </component>
@@ -1499,6 +2253,31 @@
     </collection>
    </block>
    <block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+    <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
+     <component name="exif_api" long-name="Exif API" filter="s60" class="api">
+      <unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
+     </component>
+    </collection>
+    <collection name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" level="app-if">
+     <component name="jpeg2000_icl_plugin_api" long-name="JPEG2000 ICL plugin API" filter="s60" class="api">
+      <unit bldFile="os/imagingext/imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+     </component>
+     <component name="extended_icl_jpeg_api" long-name="Extended ICL Jpeg API" filter="s60" class="api">
+      <unit bldFile="os/imagingext/imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+     </component>
+     <component name="h324_annex_k_custom_api" long-name="H324 Annex K Custom API" filter="s60" class="api">
+      <unit bldFile="os/imagingext/imagingext_plat/h324_annex_k_custom_api/group"/>
+     </component>
+     <component name="ecam_orientation_custom_api" long-name="ECam Orientation Custom API" filter="s60" class="api">
+      <unit bldFile="os/imagingext/imagingext_plat/ecam_orientation_custom_api/group"/>
+     </component>
+     <component name="ecam_ui_orientation_override_custom_api" long-name="ECam UI Orientation Override Custom API" filter="s60" class="api">
+      <unit bldFile="os/imagingext/imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+     </component>
+     <component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
+      <unit bldFile="os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
+     </component>
+    </collection>
     <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
      <component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
       <unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
@@ -1516,14 +2295,6 @@
       <unit bldFile="os/imagingext/imagingmodules/jp2kcodec/group"/>
      </component>
     </collection>
-    <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
-     <component name="imagingext_plat" filter="s60" long-name="Imaging Extensions Platform Interfaces" class="api">
-      <unit bldFile="os/imagingext/imagingext_plat/group"/>
-     </component>
-     <component name="imagingext_pub" filter="s60" long-name="Imaging Extensions Public Interfaces" class="api">
-      <unit bldFile="os/imagingext/imagingext_pub/group"/>
-     </component>
-    </collection>
    </block>
    <block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
     <collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
@@ -1574,11 +2345,12 @@
       <unit bldFile="os/graphics/graphicstest/uibench/group" mrp="os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
      </component>
     </collection>
-    <collection name="graphics_info" long-name="Graphics Info" level="app-if">
+    <collection name="graphics_plat" long-name="Graphics Platform Interfaces" level="app-if">
      <component name="m3g_core_api" filter="sf_build" long-name="M3G Core API" class="api">
       <unit bldFile="os/graphics/graphics_plat/m3g_core_api/group"/>
-      <!-- cope with missing graphics_plat/group -->
-     </component>
+     </component>
+    </collection>
+    <collection name="graphics_info" long-name="Graphics Info" level="app-if">
      <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc">
       <unit mrp="os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
      </component>
@@ -1672,6 +2444,22 @@
     <collection name="graphicsapitest" long-name="Graphics API Tests" level="app-if"/>
    </block>
    <block name="textandloc" level="services" long-name="Text and Localisation Services" levels="encoding util fonts tools text">
+    <collection name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" level="text">
+     <component name="findutil_api" long-name="Find Utility API" filter="s60" class="api">
+      <unit bldFile="os/textandloc/textandloc_plat/findutil_api/group"/>
+     </component>
+     <component name="japanese_language_utilities_api" long-name="Japanese Language Utilities API" filter="s60" class="api">
+      <unit bldFile="os/textandloc/textandloc_plat/japanese_language_utilities_api/group"/>
+     </component>
+     <component name="sortutil_api" long-name="Sorting Utility API" filter="s60" class="api">
+      <unit bldFile="os/textandloc/textandloc_plat/sortutil_api/group"/>
+     </component>
+    </collection>
+    <collection name="textandloc_pub" long-name="Text and Localisation Public Interfaces" level="text">
+     <component name="directory_localizer_api" long-name="Directory Localizer API" filter="s60" class="api">
+      <unit bldFile="os/textandloc/textandloc_pub/directory_localizer_api/group"/>
+     </component>
+    </collection>
     <collection name="charconvfw" long-name="Character Conversion" level="encoding">
      <component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional">
       <unit bldFile="os/textandloc/charconvfw/charconv_fw/group" mrp="os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
@@ -1747,18 +2535,29 @@
      </component>
     </collection>
     <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-     <component name="textandloc_pub" filter="s60" long-name="Text and Localisation Public Interfaces" class="api">
-      <unit bldFile="os/textandloc/textandloc_pub/group"/>
-     </component>
-     <component name="textandloc_plat" filter="s60" long-name="Text and Localisation Platform Interfaces" class="api">
-      <unit bldFile="os/textandloc/textandloc_plat/group"/>
-     </component>
      <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
+    <collection name="xmlsrv_plat" long-name="XML Services Platform Interfaces" level="specific">
+     <component name="xmlsrv_plat_build" long-name="XML Services Platform Interface Build" filter="s60" class="api">
+      <!-- need to fix the configuration used here. 
+	  Either destribute to other components or use the new feature flags confguration mechanisms.
+	  Remove this component and uncomment the other units when fixed-->
+      <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
+     </component>
+     <component name="xml_encryption_api" long-name="XML Encryption API" filter="s60" class="api">
+      <!-- <unit bldFile="xmlsrv_plat/xml_encryption_api/group"/> -->
+     </component>
+     <component name="xml_signature_api" long-name="XML Signature API" filter="s60" class="api">
+      <!-- <unit bldFile="xmlsrv_plat/xml_signature_api/group"/> -->
+     </component>
+     <component name="xml_security_engine_utils_api" long-name="XML Security Engine Utils API" filter="s60" class="api">
+      <!-- <unit bldFile="xmlsrv_plat/xml_security_engine_utils_api/group"/> -->
+     </component>
+    </collection>
     <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
      <component name="xmlseccertman" filter="s60" long-name="XML Security Certificate Manager">
       <unit bldFile="os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
@@ -1797,9 +2596,6 @@
      </component>
     </collection>
     <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-     <component name="xmlsrv_plat" filter="s60" long-name="XML Services Platform Interfaces" class="api">
-      <unit bldFile="os/xmlsrv/xmlsrv_plat/group"/>
-     </component>
      <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
      </component>
@@ -2025,10 +2821,6 @@
      </component>
     </collection>
     <collection name="osrndtools_info" long-name="OS R&amp;D tools Info" level="trace">
-     <component name="osrndtools_plat" filter="s60" long-name="OS R&amp;D tools Platform Interfaces" purpose="development" class="api">
-      <unit bldFile="os/osrndtools/osrndtools_plat/group"/>
-      <!-- currently empty. Remove? -->
-     </component>
      <component name="osrndtools_metadata" long-name="OS R&amp;D tools Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
      </component>
@@ -2037,6 +2829,106 @@
   </layer>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
+    <collection name="appsupport_pub" long-name="Generic Application Support Public Interfaces" level="specific">
+     <component name="flash_viewer_framework_api" long-name="Flash Viewer Framework API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_pub/flash_viewer_framework_api/group"/>
+     </component>
+     <component name="network_status_api" long-name="Network Status API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_pub/network_status_api/group"/>
+     </component>
+    </collection>
+    <collection name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" level="specific">
+     <component name="action_plugin_api" long-name="Action Plug-In API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/action_plugin_api/group"/>
+     </component>
+     <component name="application_orientation_api" long-name="Application Orientation API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/application_orientation_api/group"/>
+     </component>
+     <component name="context_access_api" long-name="Context Access API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/context_access_api/group"/>
+     </component>
+     <component name="context_framework_services_api" long-name="Context Framework Services API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_services_api/group"/>
+     </component>
+     <component name="context_framework_client_api" long-name="Context Framework Client API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_client_api/group"/>
+     </component>
+     <component name="context_framework_listener_api" long-name="Context Framework Listener API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_listener_api/group"/>
+     </component>
+     <component name="context_framework_version_api" long-name="Context Framework Version API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/context_framework_version_api/group"/>
+     </component>
+     <component name="context_source_plugin_api" long-name="Context Source Plug-In API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/context_source_plugin_api/group"/>
+     </component>
+     <component name="context_source_settings_manager_api" long-name="Context Source Settings Manager API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/context_source_settings_manager_api/group"/>
+     </component>
+     <component name="context_subscription_api" long-name="Context Subscription API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/context_subscription_api/group"/>
+     </component>
+     <component name="key_event_framework_api" long-name="Key Event Framework API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_api/group"/>
+     </component>
+     <component name="key_event_framework_mapper_api" long-name="Key Event Framework Mapper API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/key_event_framework_mapper_api/group"/>
+     </component>
+     <component name="media_keys_definition_api" long-name="Media Keys Definition API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/media_keys_definition_api/group"/>
+     </component>
+     <component name="ood_threshold_api" long-name="OOD Threshold API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/ood_threshold_api/group"/>
+     </component>
+     <component name="oom_monitor_api" long-name="OOM Monitor API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_api/group"/>
+     </component>
+     <component name="oom_monitor_plugin_api" long-name="OOM Monitor Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/oom_monitor_plugin_api/group"/>
+     </component>
+     <component name="operation_provider_api" long-name="Operation Provider API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/operation_provider_api/group"/>
+     </component>
+     <component name="phonecmdhandler_api" long-name="Phone Command Handler API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/phonecmdhandler_api/group"/>
+     </component>
+     <component name="restore_factory_settings_api" long-name="Restore Factory Settings API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_api/group"/>
+     </component>
+     <component name="restore_factory_settings_plugin_api" long-name="Restore Factory Settings Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/restore_factory_settings_plugin_api/group"/>
+     </component>
+     <component name="secondary_display_accfw_api" long-name="Secondary Display Accessory Framework API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_accfw_api/group"/>
+     </component>
+     <component name="secondary_display_startup_api" long-name="Secondary Display Startup API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_startup_api/group"/>
+     </component>
+     <component name="secondary_display_sysap_api" long-name="Secondary Display System Application API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_sysap_api/group"/>
+     </component>
+     <component name="secondary_display_system_state_api" long-name="Secondary Display System State API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/secondary_display_system_state_api/group"/>
+     </component>
+     <component name="sensor_user_setting_api" long-name="Sensor User Setting API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/sensor_user_setting_api/group"/>
+     </component>
+     <component name="startup_configuration_api" long-name="Startup Configuration API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/startup_configuration_api/group"/>
+     </component>
+     <component name="system_application_key_handler_plugin_api" long-name="System Application Key Handler Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/system_application_key_handler_plugin_api/group"/>
+     </component>
+     <component name="system_application_light_control_plugin_api" long-name="System Application Light Control Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/system_application_light_control_plugin_api/group"/>
+     </component>
+     <component name="system_application_notification_api" long-name="System Application Notification API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/system_application_notification_api/group"/>
+     </component>
+     <component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
+      <unit bldFile="mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
+     </component>
+    </collection>
     <collection name="contextframework" long-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 -->
@@ -2169,6 +3061,9 @@
      <component name="tzlocrscfactory" long-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 name="tzdatabase" long-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 name="contenthandling" long-name="Content Handling" level="plugin">
      <component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y">
@@ -2210,18 +3105,68 @@
      </component>
     </collection>
     <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-     <component name="appsupport_plat" filter="s60" long-name="Generic Application Support Platform Interfaces" class="api">
-      <unit bldFile="mw/appsupport/appsupport_plat/group"/>
-     </component>
-     <component name="appsupport_pub" filter="s60" long-name="Generic Application Support Public Interfaces" class="api">
-      <unit bldFile="mw/appsupport/appsupport_pub/group"/>
-     </component>
      <component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="securitysrv" level="generic" long-name="Security Services" levels="plugin framework server generic specific">
+    <collection name="secsrv_plat" long-name="Security Services Platform Interfaces" level="specific">
+     <component name="cms_api" long-name="CMS API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/cms_api/group"/>
+     </component>
+     <component name="pkcs12_parser_api" long-name="PKCS12 Parser API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/pkcs12_parser_api/group"/>
+     </component>
+     <component name="java_utils_api" long-name="Java Utils API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/java_utils_api/group"/>
+     </component>
+     <component name="wim_cert_api" long-name="WIM Cert API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/wim_cert_api/group"/>
+     </component>
+     <component name="device_key_store_encryption_plugin_api" long-name="Device Key Store Encryption Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/device_key_store_encryption_plugin_api/group"/>
+     </component>
+     <component name="x509certnameparser_api" long-name="X.509 Certificate Name Parser API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/x509certnameparser_api/group"/>
+     </component>
+     <component name="remote_lock_api" long-name="Remote Lock API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/remote_lock_api/group"/>
+     </component>
+     <component name="pkidialog_api" long-name="PKI Dialog API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/pkidialog_api/group"/>
+     </component>
+     <component name="provisioning_api" long-name="Provisioning API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/provisioning_api/group"/>
+     </component>
+     <component name="keyguard_configuration_api" long-name="Keyguard Configuration API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_configuration_api/group"/>
+     </component>
+     <component name="keylock_policy_api" long-name="Keylock Policy API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/keylock_policy_api/group"/>
+     </component>
+     <component name="security_code_ui_api" long-name="Security Code UI API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/security_code_ui_api/group"/>
+     </component>
+     <component name="gba_api" long-name="GBA API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/gba_api/group"/>
+     </component>
+     <component name="keyguard_access_api" long-name="Keyguard Access API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/keyguard_access_api/group"/>
+     </component>
+     <component name="devicelock_access_api" long-name="Device Lock Access API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/devicelock_access_api/group"/>
+     </component>
+     <component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
+     </component>
+     <component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+     </component>
+     <component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" class="api">
+      <unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
+     </component>
+    </collection>
     <collection name="cms" long-name="Certificate Management Service" level="server">
      <!-- collection is really a component. Need to move down a directory-->
      <component name="cms_build" filter="s60" long-name="CMS" introduced="^3">
@@ -2339,15 +3284,67 @@
      </component>
     </collection>
     <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-     <component name="secsrv_plat" long-name="Security Services Platform Interfaces" filter="s60" class="api">
-      <unit bldFile="mw/securitysrv/secsrv_plat/group"/>
-     </component>
      <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="drm" level="generic" long-name="DRM" levels="plugin framework server generic specific">
+    <collection name="drm_plat" long-name="DRM Platform Interfaces" level="specific">
+     <component name="roap_api" long-name="ROAP API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/roap_api/group"/>
+     </component>
+     <component name="drm_common_api" long-name="DRM Common API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/drm_common_api/group"/>
+     </component>
+     <component name="drm_rights_api" long-name="DRM Rights API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/drm_rights_api/group"/>
+     </component>
+     <component name="drm_legacy_api" long-name="DRM Legacy API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/drm_legacy_api/group"/>
+     </component>
+     <component name="dcf_repository_api" long-name="DCF Repository API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/dcf_repository_api/group"/>
+     </component>
+     <component name="drm_service_api" long-name="DRM Service API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/drm_service_api/group"/>
+     </component>
+     <component name="drm_secondary_display_api" long-name="DRM Secondary Display API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/drm_secondary_display_api/group"/>
+     </component>
+     <component name="drm_license_manager_api" long-name="DRM License Manager API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/drm_license_manager_api/group"/>
+     </component>
+     <component name="drm_utility_api" long-name="DRM Utility API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/drm_utility_api/group"/>
+     </component>
+     <component name="drm_agents_api" long-name="DRM Agents API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/drm_agents_api/group"/>
+     </component>
+     <component name="wmdrm_core_api" long-name="WM DRM Core API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/wmdrm_core_api/group"/>
+     </component>
+     <component name="wmdrm_access_api" long-name="WMDRM Access API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/wmdrm_access_api/group"/>
+     </component>
+     <component name="camese_utility_api" long-name="Camese Utility API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/camese_utility_api/group"/>
+     </component>
+     <component name="camese_framework_api" long-name="Camese Framework API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_plat/camese_framework_api/group"/>
+     </component>
+    </collection>
+    <collection name="drm_pub" long-name="DRM Public Interfaces" level="specific">
+     <component name="drm_helper_api" long-name="DRM Helper API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_pub/drm_helper_api/group"/>
+     </component>
+     <component name="oma_drm_caf_agent_api" long-name="OMA DRM CAF Agent API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_pub/oma_drm_caf_agent_api/group"/>
+     </component>
+     <component name="drm_license_checker_api" long-name="DRM License Checker API" filter="s60" class="api">
+      <unit bldFile="mw/drm/drm_pub/drm_license_checker_api/group"/>
+     </component>
+    </collection>
     <collection name="commondrm" long-name="Common DRM" level="generic">
      <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
      <component name="drmencryptor" filter="s60" long-name="DRM Encryptor" class="placeholder">
@@ -2389,16 +3386,97 @@
       <unit bldFile="mw/drm/wmdrm/group"/>
      </component>
     </collection>
-    <collection name="drm_info" long-name="DRM Info" level="specific">
-     <component name="drm_pub" filter="s60" long-name="DRM Public Interfaces" class="api">
-      <unit bldFile="mw/drm/drm_pub/group"/>
-     </component>
-     <component name="drm_plat" filter="s60" long-name="DRM Platform Interfaces" class="api">
-      <unit bldFile="mw/drm/drm_plat/group"/>
-     </component>
-    </collection>
+    <collection name="drm_info" long-name="DRM Info" level="specific"/>
    </block>
    <block name="locationsrv" level="specific" long-name="Location Services" levels="plugin fw server if">
+    <collection name="locsrv_pub" long-name="Location Services Public Interfaces" level="if">
+     <component name="landmarks_search_api" long-name="Landmarks Search API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_search_api/group"/>
+     </component>
+     <component name="landmarks_api" long-name="Landmarks API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_api/group"/>
+     </component>
+     <component name="landmarks_database_management_api" long-name="Landmarks Database Management API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_pub/landmarks_database_management_api/group"/>
+     </component>
+     <component name="location_triggering_api" long-name="Location Triggering API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_pub/location_triggering_api/group"/>
+     </component>
+     <component name="blid_application_satellite_info_api" long-name="BLID Application Satellite Info API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/group"/>
+     </component>
+    </collection>
+    <collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
+     <component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
+     </component>
+     <component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
+     </component>
+     <component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
+     </component>
+     <component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
+     </component>
+     <component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
+     </component>
+     <component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
+     </component>
+     <component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
+     </component>
+     <component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
+     </component>
+     <component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
+     </component>
+     <component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
+     </component>
+     <component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
+     </component>
+     <component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
+     </component>
+     <component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
+     </component>
+     <component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
+     </component>
+     <component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
+     </component>
+     <component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
+     </component>
+     <component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
+     </component>
+     <component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
+     </component>
+     <component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
+     </component>
+     <component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
+     </component>
+     <component name="location_triggering_status_information_api" long-name="Location Triggering Status Information API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_status_information_api/group"/>
+     </component>
+     <component name="oma_supl_asn_codec_plugin_api" long-name="OMA SUPL ASN Codec Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/group"/>
+     </component>
+     <component name="location_local_variation_api" long-name="Location Local Variation API" filter="s60" class="api">
+      <unit bldFile="mw/locationsrv/locsrv_plat/location_local_variation_api/group"/>
+     </component>
+    </collection>
     <collection name="genericpositioningplugins" long-name="Generic Positioning Plugins" level="plugin">
      <component name="locationnpppsy" filter="s60" long-name="Location Positioning Proxy PSY" plugin="Y">
       <unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
@@ -2483,16 +3561,52 @@
       <unit bldFile="mw/locationsrv/locationtriggering/group"/>
      </component>
     </collection>
-    <collection name="locationsrv_info" long-name="Location Services Info" level="if">
-     <component name="locsrv_plat" filter="s60" long-name="Location Services Platform Interfaces" class="api">
-      <unit bldFile="mw/locationsrv/locsrv_plat/group"/>
-     </component>
-     <component name="locsrv_pub" filter="s60" long-name="Location Services Public Interfaces" class="api">
-      <unit bldFile="mw/locationsrv/locsrv_pub/group"/>
-     </component>
-    </collection>
    </block>
    <block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
+    <collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
+     <component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
+     </component>
+     <component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
+     </component>
+     <component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
+     </component>
+     <component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
+     </component>
+     <component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
+     </component>
+     <component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
+     </component>
+     <component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
+     </component>
+     <component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
+     </component>
+     <component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
+     </component>
+     <component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
+     </component>
+     <component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
+     </component>
+     <component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
+     </component>
+     <component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
+     </component>
+     <component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
+      <unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
+     </component>
+    </collection>
     <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
      <component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
       <!-- the directory for this needs to be moved up to the right level -->
@@ -2516,13 +3630,72 @@
       <unit bldFile="mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
      </component>
     </collection>
-    <collection name="accesssec_info" long-name="Access Security Info" level="specific">
-     <component name="accesssec_plat" filter="s60" long-name="Access Security Platform Interfaces" class="api">
-      <unit bldFile="mw/accesssec/accesssec_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="ipconnmgmt" level="generic" long-name="IP Connectivity Management" levels="plugin framework server generic utils">
+    <collection name="ipcm_plat" long-name="IP Connectivity Management Platform Interfaces" level="utils">
+     <component name="access_point_engine_misc_api" long-name="Access Point Engine Misc API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/access_point_engine_misc_api/group"/>
+     </component>
+     <component name="bearer_settings_plugin_api" long-name="Bearer Settings Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/bearer_settings_plugin_api/group"/>
+     </component>
+     <component name="commsdat_wlan_api" long-name="CommsDat WLAN API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/commsdat_wlan_api/group"/>
+     </component>
+     <component name="connection_monitor_extension_api" long-name="Connection Monitor Extension API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_monitor_extension_api/group"/>
+     </component>
+     <component name="connection_ui_utilities_api" long-name="Connection UI Utilities API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/connection_ui_utilities_api/group"/>
+     </component>
+     <component name="disconnect_dialog_api" long-name="Disconnect Dialog API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_api/group"/>
+     </component>
+     <component name="disconnect_dialog_disable_api" long-name="Disconnect Dialog Disable API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/disconnect_dialog_disable_api/group"/>
+     </component>
+     <component name="extended_connection_settings_api" long-name="Extended Connection Settings API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/extended_connection_settings_api/group"/>
+     </component>
+     <component name="mpm_default_connection_api" long-name="MPM Default Connection API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_default_connection_api/group"/>
+     </component>
+     <component name="pdpcontextmanager2_reset_factory_settings_api" long-name="PDP Context Manager 2 Reset Factory Settings API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
+     </component>
+     <component name="pdpcontextmanager2_settings_api" long-name="PDP Context Manager 2 Settings API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/pdpcontextmanager2_settings_api/group"/>
+     </component>
+     <component name="mpm_connect_screen_api" long-name="MPM Connect Screen API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_plat/mpm_connect_screen_api/group"/>
+     </component>
+    </collection>
+    <collection name="ipcm_pub" long-name="IP Connectivity Management Public Interfaces" level="utils">
+     <component name="connection_settings_api" long-name="Connection Settings API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_api/group"/>
+     </component>
+     <component name="access_point_engine_api" long-name="Access Point Engine API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_engine_api/group"/>
+     </component>
+     <component name="access_point_settings_handler_api" long-name="Access Point Settings Handler API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/access_point_settings_handler_api/group"/>
+     </component>
+     <component name="data_connection_log_counters_api" long-name="Data Connection Log Counters API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/data_connection_log_counters_api/group"/>
+     </component>
+     <component name="connection_monitor_server_api" long-name="Connection Monitor Server API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_monitor_server_api/group"/>
+     </component>
+     <component name="connection_settings_ui_api" long-name="Connection Settings UI API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/connection_settings_ui_api/group"/>
+     </component>
+     <component name="agent_dialog_api" long-name="Agent Dialog API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/agent_dialog_api/group"/>
+     </component>
+     <component name="extendedconnpref_api" long-name="Extended Connection Preferences API" filter="s60" class="api">
+      <unit bldFile="mw/ipconnmgmt/ipcm_pub/extendedconnpref_api/group"/>
+     </component>
+    </collection>
     <collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
      <component name="apcontrollistplugin" filter="s60" long-name="Access Point Control List Plugin" introduced="^2" plugin="Y">
       <unit bldFile="mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
@@ -2604,12 +3777,6 @@
      </component>
     </collection>
     <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-     <component name="ipcm_pub" filter="s60" long-name="IP Connectivity Management Public Interfaces" class="api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_pub/group"/>
-     </component>
-     <component name="ipcm_plat" filter="s60" long-name="IP Connectivity Management Platform Interfaces" class="api">
-      <unit bldFile="mw/ipconnmgmt/ipcm_plat/group"/>
-     </component>
      <component name="ipcm_build" filter="s60" long-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"/>
@@ -2617,6 +3784,17 @@
     </collection>
    </block>
    <block name="netprotocols" level="generic" long-name="High-level Internet Protocols" levels="plugin framework server generic specific">
+    <collection name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" level="specific">
+     <component name="cookie_manager_api" long-name="Cookie Manager API" filter="s60" class="api">
+      <unit bldFile="mw/netprotocols/netprotocols_plat/cookie_manager_api/group"/>
+     </component>
+     <component name="http_cache_mgr_api" long-name="HTTP Cache Manager API" filter="s60" class="api">
+      <unit bldFile="mw/netprotocols/netprotocols_plat/http_cache_mgr_api/group"/>
+     </component>
+     <component name="http_filters_api" long-name="HTTP Filters API" filter="s60" class="api">
+      <unit bldFile="mw/netprotocols/netprotocols_plat/http_filters_api/group"/>
+     </component>
+    </collection>
     <collection name="httpfilters" long-name="HTTP Filters" level="plugin">
      <component name="httpfiltercommon" filter="s60" long-name="HTTP Filter Common">
       <unit bldFile="mw/netprotocols/httpfilters/httpfiltercommon/group"/>
@@ -2684,15 +3862,20 @@
      </component>
     </collection>
     <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-     <component name="netprotocols_plat" filter="s60" long-name="High-level Internet Protocols Platform Interfaces" class="api">
-      <unit bldFile="mw/netprotocols/netprotocols_plat/group"/>
-     </component>
      <component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin conn server if">
+    <collection name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" level="if">
+     <component name="srtp_api" long-name="SRTP API" filter="s60" class="api">
+      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/srtp_api/group"/>
+     </component>
+     <component name="rtprtcp_api" long-name="RTP/RTCP API" filter="s60" class="api">
+      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/rtprtcp_api/group"/>
+     </component>
+    </collection>
     <collection name="rtp" long-name="RTP" level="server">
      <component name="srtpstack" filter="s60" long-name="SRTP Stack">
       <unit bldFile="mw/ipappprotocols/rtp/srtpstack/group"/>
@@ -2733,15 +3916,26 @@
      </component>
     </collection>
     <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="if">
-     <component name="ipappprotocols_plat" filter="s60" long-name="IP App Protocols Platform Interfaces" class="api">
-      <unit bldFile="mw/ipappprotocols/ipappprotocols_plat/group"/>
-     </component>
      <component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
+    <collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
+     <component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
+      <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
+     </component>
+     <component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
+      <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
+     </component>
+     <component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
+      <unit bldFile="mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
+     </component>
+     <component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
+     </component>
+    </collection>
     <collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
      <component name="hsserver" filter="s60" long-name="HotSpot Server" class="placeholder">
       <!-- needs bld.inf extracted from the hotspotfw/group one, or this component should be removed-->
@@ -2784,14 +3978,14 @@
       <unit bldFile="mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
      </component>
     </collection>
-    <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
-     <component name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" filter="s60" class="api">
-      <unit bldFile="mw/wirelessacc/hsfw_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
     <!-- is the !oem_build filter needed? -->
+    <collection name="vpnc_plat" long-name="VPN Client Platform Interfaces" level="api">
+     <component name="vpnapi" filter="s60" long-name="VPN API" class="api">
+      <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
+     </component>
+    </collection>
     <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
      <component name="vpnapi" filter="s60" long-name="VPN API">
       <unit bldFile="mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
@@ -2911,12 +4105,29 @@
       <!-- should split this up into the other components and remove this-->
       <unit bldFile="mw/vpnclient/group" filter="!oem_build"/>
      </component>
-     <component name="vpnc_plat" filter="s60" long-name="VPN Client Platform Interfaces" class="api">
-      <unit bldFile="mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
-     </component>
     </collection>
    </block>
    <block name="ipappsrv" level="specific" long-name="IP App Services" levels="framework generic server conn plugin">
+    <collection name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" level="plugin">
+     <component name="transcoder_api" long-name="Transcoder API" filter="s60" class="api">
+      <unit bldFile="mw/ipappsrv/ipappsrv_plat/transcoder_api/group"/>
+     </component>
+     <component name="comms_event_api" long-name="Comms Event API" filter="s60" class="api">
+      <unit bldFile="mw/ipappsrv/ipappsrv_plat/comms_event_api/group"/>
+     </component>
+     <component name="floor_control_api" long-name="Floor Control API" filter="s60" class="api">
+      <unit bldFile="mw/ipappsrv/ipappsrv_plat/floor_control_api/group"/>
+     </component>
+     <component name="media_control_api" long-name="Media Control API" filter="s60" class="api">
+      <unit bldFile="mw/ipappsrv/ipappsrv_plat/media_control_api/group"/>
+     </component>
+     <component name="multimedia_comms_api" long-name="Multimedia Comms API" filter="s60" class="api">
+      <unit bldFile="mw/ipappsrv/ipappsrv_plat/multimedia_comms_api/group"/>
+     </component>
+     <component name="nat_settings_api" long-name="NAT Settings API" filter="s60" class="api">
+      <unit bldFile="mw/ipappsrv/ipappsrv_plat/nat_settings_api/group"/>
+     </component>
+    </collection>
     <collection name="natfw" long-name="NAT Framework" level="framework">
      <!-- collection is really a component. Need to move down a directory -->
      <component name="natfw_build" filter="s60" long-name="NAT Framework Build" introduced="^2">
@@ -2950,9 +4161,6 @@
      </component>
     </collection>
     <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-     <component name="ipappsrv_plat" filter="s60" long-name="IP App Services Platform Interfaces" class="api">
-      <unit bldFile="mw/ipappsrv/ipappsrv_plat/group"/>
-     </component>
      <component name="ipappsrv_build" long-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"/>
@@ -2963,6 +4171,122 @@
     </collection>
    </block>
    <block name="phonesrv" level="specific" long-name="Telephony and SIM Services" levels="plugin framework server generic specific">
+    <collection name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" level="specific">
+     <component name="string_parser_api" long-name="String Parser API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/string_parser_api/group"/>
+     </component>
+     <component name="cbs_mcn_client_api" long-name="CBS MCN Client API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_mcn_client_api/group"/>
+     </component>
+     <component name="converged_call_engine_api" long-name="Converged Call Engine API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_engine_api/group"/>
+     </component>
+     <component name="aiw_dial_data_consumer_api" long-name="AIW Dial Data Consumer API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/aiw_dial_data_consumer_api/group"/>
+     </component>
+     <component name="phone_client_ussd_api" long-name="Phone Client USSD API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_api/group"/>
+     </component>
+     <component name="sat_refresh_api" long-name="SAT Refresh API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_refresh_api/group" filter="!test"/>
+     </component>
+     <component name="network_handling_engine_api" long-name="Network Handling Engine API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/network_handling_engine_api/group"/>
+     </component>
+     <component name="phone_client_emergency_call_api" long-name="Phone Client Emergency Call API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/group"/>
+     </component>
+     <component name="sat_configuration_api" long-name="SAT Configuration API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_configuration_api/group"/>
+     </component>
+     <component name="dial_utils_api" long-name="Dial Utils API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/dial_utils_api/group"/>
+     </component>
+     <component name="phone_client_image_handler_api" long-name="Phone Client Image Handler API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_image_handler_api/group"/>
+     </component>
+     <component name="phone_client_messenger_api" long-name="Phone Client Messenger API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_messenger_api/group"/>
+     </component>
+     <component name="sat_client_api" long-name="SAT Client API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_client_api/group" filter="!test"/>
+     </component>
+     <component name="phone_client_api" long-name="Phone Client API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_api/group"/>
+     </component>
+     <component name="sat_service_api" long-name="SAT Service API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/sat_service_api/group" filter="!test"/>
+     </component>
+     <component name="cbs_message_api" long-name="CBS Message API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/cbs_message_api/group"/>
+     </component>
+     <component name="phone_client_server_information_api" long-name="Phone Client Server Information API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_server_information_api/group"/>
+     </component>
+     <component name="phone_client_ussd_internal_api" long-name="Phone Client USSD Internal API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_ussd_internal_api/group"/>
+     </component>
+     <component name="phone_client_command_handler_api" long-name="Phone Client Command Handler API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_command_handler_api/group"/>
+     </component>
+     <component name="phone_client_notify_api" long-name="Phone Client Notify API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_notify_api/group"/>
+     </component>
+     <component name="phone_client_utility_api" long-name="Phone Client Utility API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_client_utility_api/group"/>
+     </component>
+     <component name="telephony_network_information_api" long-name="Telephony Network Information API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/telephony_network_information_api/group"/>
+     </component>
+     <component name="secondary_display_sat_api" long-name="Secondary Display SAT API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/secondary_display_sat_api/group"/>
+     </component>
+     <component name="callui_reconnect_query_api" long-name="CallUI Reconnect Query API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/callui_reconnect_query_api/group"/>
+     </component>
+     <component name="service_provider_settings_api" long-name="Service Provider Settings API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/service_provider_settings_api/group"/>
+     </component>
+     <component name="converged_call_provider_api" long-name="Converged Call Provider API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/converged_call_provider_api/group"/>
+     </component>
+     <component name="incoming_call_monitor_api" long-name="Incoming Call Monitor API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/incoming_call_monitor_api/group"/>
+     </component>
+     <component name="default_emergency_numbers_api" long-name="Default Emergency Numbers API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/default_emergency_numbers_api/group"/>
+     </component>
+     <component name="cenrep_database_api" long-name="Central Repository Database API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/cenrep_database_api/group"/>
+     </component>
+     <component name="ss_settings_api" long-name="SS Settings API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/ss_settings_api/group"/>
+     </component>
+     <component name="phone_settings_observer_api" long-name="Phone Settings Observer API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_observer_api/group"/>
+     </component>
+     <component name="phone_settings_notes_ui_api" long-name="Phone Settings Notes UI API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_notes_ui_api/group"/>
+     </component>
+     <component name="phone_settings_api" long-name="Phone Settings API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/phone_settings_api/group"/>
+     </component>
+     <component name="voice_mailbox_number_api" long-name="Voice Mailbox Number API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_number_api/group"/>
+     </component>
+     <component name="voice_mailbox_settings_api" long-name="Voice Mailbox Settings API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/voice_mailbox_settings_api/group"/>
+     </component>
+     <component name="call_information_api" long-name="Call Information API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/call_information_api/group" filter="!test"/>
+     </component>
+     <component name="call_remote_party_information_api" long-name="Call Remote Party Information API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/call_remote_party_information_api/group" filter="!test"/>
+     </component>
+     <component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+      <unit bldFile="mw/phonesrv/phonesrv_plat/telephony_mediator_api/group"/>
+     </component>
+    </collection>
     <collection name="telutils" long-name="Telephony Utils" level="generic">
      <component name="phoneparser" filter="s60" long-name="Phone Parser">
       <unit bldFile="mw/phonesrv/telutils/phoneparser/group"/>
@@ -3062,16 +4386,31 @@
       <unit bldFile="mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
      </component>
     </collection>
-    <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
-     <component name="phonesrv_plat" filter="s60" long-name="Telephony and SIM Services Platform Interfaces" class="api">
-      <unit bldFile="mw/phonesrv/phonesrv_plat/group"/>
-     </component>
-     <component name="phonesrv_pub" filter="s60" long-name="Telephony and SIM Services Public Interfaces" class="api">
-      <unit bldFile="mw/phonesrv/phonesrv_pub/group"/>
-     </component>
-    </collection>
+    <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific"/>
    </block>
    <block name="messagingmw" level="specific" long-name="Messaging Middleware" levels="stack fw api">
+    <collection name="msgfw_pub" long-name="Messaging Middleware Public Interfaces" level="api">
+     <component name="send_ui_api" long-name="Send UI API" filter="s60" class="api">
+      <unit bldFile="mw/messagingmw/msgfw_pub/send_ui_api/group"/>
+     </component>
+    </collection>
+    <collection name="msgfw_plat" long-name="Messaging Middleware Platform Interfaces" level="api">
+     <component name="always_online_plugin_api" long-name="Always Online Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/messagingmw/msgfw_plat/always_online_plugin_api/group"/>
+     </component>
+     <component name="always_online_client_api" long-name="Always Online Client API" filter="s60" class="api">
+      <unit bldFile="mw/messagingmw/msgfw_plat/always_online_client_api/group"/>
+     </component>
+     <component name="msg_common_utils_api" long-name="Messaging Common Utils API" filter="s60" class="api">
+      <unit bldFile="mw/messagingmw/msgfw_plat/msg_common_utils_api/group"/>
+     </component>
+     <component name="send_ui_plugin_api" long-name="Send UI Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_plugin_api/group"/>
+     </component>
+     <component name="send_ui_datautils_api" long-name="Send UI Data Utils API" filter="s60" class="api">
+      <unit bldFile="mw/messagingmw/msgfw_plat/send_ui_datautils_api/group"/>
+     </component>
+    </collection>
     <collection name="msgbranched" long-name="Messaging Branched" level="fw">
      <!-- collection is really a component. Need to move down a directory -->
      <component name="msgbranched_build" filter="s60" long-name="Messaging Branched Build">
@@ -3124,18 +4463,92 @@
      </component>
     </collection>
     <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-     <component name="msgfw_plat" filter="s60" long-name="Messaging Middleware Platform Interfaces" class="api">
-      <unit bldFile="mw/messagingmw/msgfw_plat/group"/>
-     </component>
-     <component name="msgfw_pub" filter="s60" long-name="Messaging Middleware Public Interfaces" class="api">
-      <unit bldFile="mw/messagingmw/msgfw_pub/group"/>
-     </component>
      <component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
+    <collection name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" level="specific">
+     <component name="ximp_core_data_model_api" long-name="XIMP Core Data Model API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_data_model_api/group"/>
+     </component>
+     <component name="ximp_presence_protocol_plugin_host_api" long-name="XIMP Presence Protocol Plug-in Host API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_host_api/group"/>
+     </component>
+     <component name="ximp_presence_data_model_api" long-name="XIMP Presence Data Model API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_data_model_api/group"/>
+     </component>
+     <component name="ximp_presence_protocol_plugin_api" long-name="XIMP Presence Protocol Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_protocol_plugin_api/group"/>
+     </component>
+     <component name="ximp_presence_management_api" long-name="XIMP Presence Management API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_management_api/group"/>
+     </component>
+     <component name="ximp_core_protocol_plugin_host_api" long-name="XIMP Core Protocol Plug-in Host API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_host_api/group"/>
+     </component>
+     <component name="ximp_core_management_api" long-name="XIMP Core Management API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_management_api/group"/>
+     </component>
+     <component name="ximp_presence_base_api" long-name="XIMP Presence Base API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_base_api/group"/>
+     </component>
+     <component name="ximp_core_protocol_plugin_api" long-name="XIMP Core Protocol Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_protocol_plugin_api/group"/>
+     </component>
+     <component name="ximp_core_base_api" long-name="XIMP Core Base API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_base_api/group"/>
+     </component>
+     <component name="ximp_presence_cache_api" long-name="XIMP Presence Cache API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_presence_cache_api/group"/>
+     </component>
+     <component name="ximp_core_feature_plugin_api" long-name="XIMP Core Feature Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/group"/>
+     </component>
+     <component name="ximp_im_protocol_plugin_host_api" long-name="XIMP IM Protocol Plugin Host API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_host_api/group"/>
+     </component>
+     <component name="ximp_im_data_model_api" long-name="XIMP IM Data Model API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_data_model_api/group"/>
+     </component>
+     <component name="ximp_im_protocol_plugin_api" long-name="XIMP IM Protocol Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_protocol_plugin_api/group"/>
+     </component>
+     <component name="ximp_im_management_api" long-name="XIMP IM Management API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_management_api/group"/>
+     </component>
+     <component name="ximp_im_base_api" long-name="XIMP IM Base API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_im_base_api/group"/>
+     </component>
+     <component name="ximp_search_protocol_plugin_host_api" long-name="XIMP Search Protocol Plugin Host API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_host_api/group"/>
+     </component>
+     <component name="ximp_search_data_model_api" long-name="XIMP Search Data Model API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_data_model_api/group"/>
+     </component>
+     <component name="ximp_search_protocol_plugin_api" long-name="XIMP search Protocol Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_protocol_plugin_api/group"/>
+     </component>
+     <component name="ximp_search_management_api" long-name="XIMP Search Management API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_management_api/group"/>
+     </component>
+     <component name="ximp_search_base_api" long-name="XIMP Search Base API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/ximp_search_base_api/group"/>
+     </component>
+     <component name="xmpp_settings_api" long-name="XMPP Settings API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/xmpp_settings_api/group"/>
+     </component>
+     <component name="im_cache_client_api" long-name="IM Cache Client API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/im_cache_client_api/group"/>
+     </component>
+     <component name="im_cache_server_api" long-name="IM Cache Server API" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
+     </component>
+     <component name="presence_avabilitytext" long-name="Presence Avability Text" filter="s60" class="api">
+      <unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
+     </component>
+    </collection>
     <collection name="ximpfw" long-name="XIMP Framework" level="framework">
      <!-- collection is really a component. Needs to be moved down a directory -->
      <component name="ximpfw_build" filter="s60" long-name="XIMP Framework Build">
@@ -3168,13 +4581,49 @@
       <unit bldFile="mw/imsrv/brandingserver/group"/>
      </component>
     </collection>
-    <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
-     <component name="imsrv_plat" filter="s60" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api">
-      <unit bldFile="mw/imsrv/imsrv_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="legacypresence" level="specific" long-name="Legacy Presence Services" levels="engine fw ui">
+    <collection name="pressrv_plat" long-name="Legacy Presence Services Platform Interfaces" level="ui">
+     <component name="presence_list_api" long-name="Presence List API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/presence_list_api/group"/>
+     </component>
+     <component name="watcher_info_api" long-name="Watcher Info API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/watcher_info_api/group"/>
+     </component>
+     <component name="simple_documents_api" long-name="SIMPLE Documents API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/simple_documents_api/group"/>
+     </component>
+     <component name="authorization_api" long-name="Authorization API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/authorization_api/group"/>
+     </component>
+     <component name="xdm_protocol_plugin_api" long-name="XDM Protocol Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_protocol_plugin_api/group"/>
+     </component>
+     <component name="watcher_api" long-name="Watcher API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/watcher_api/group"/>
+     </component>
+     <component name="xdm_api" long-name="XDM API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_api/group"/>
+     </component>
+     <component name="registration_api" long-name="Registration API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/registration_api/group"/>
+     </component>
+     <component name="publisher_api" long-name="Publisher API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/publisher_api/group"/>
+     </component>
+     <component name="messaging_connection_manager_api" long-name="Messaging Connection Manager API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/messaging_connection_manager_api/group"/>
+     </component>
+     <component name="xdm_settings_api" long-name="XDM Settings API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/xdm_settings_api/group"/>
+     </component>
+     <component name="simple_settings_api" long-name="SIMPLE Settings API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/simple_settings_api/group"/>
+     </component>
+     <component name="simple_instant_msg_api" long-name="Simple Instant Msg API" filter="s60" class="api">
+      <unit bldFile="mw/legacypresence/pressrv_plat/simple_instant_msg_api/group"/>
+     </component>
+    </collection>
     <collection name="xdmengine" long-name="XDM Engine" level="engine">
      <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
      <component name="xdmengine_build" filter="s60" long-name="XDM Engine Build">
@@ -3222,13 +4671,13 @@
       <unit bldFile="mw/legacypresence/simpledatamodeladapter/group"/>
      </component>
     </collection>
-    <collection name="legacypresence_info" long-name="Legacy Presence Services Info" level="ui">
-     <component name="pressrv_plat" filter="s60" long-name="Legacy Presence Services Platform Interfaces" class="api">
-      <unit bldFile="mw/legacypresence/pressrv_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
+    <collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
+     <component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
+     </component>
+    </collection>
     <collection name="loudmouth" long-name="Loudmouth" level="prt">
      <!-- collection is really a component so it needs to be moved down a directory -->
      <component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
@@ -3259,13 +4708,129 @@
       <unit bldFile="mw/opensrv/isolationserver/group"/>
      </component>
     </collection>
-    <collection name="opensrv_info" long-name="Open Services Info" level="eng">
-     <component name="opensrv_plat" filter="s60" long-name="Open Services Platform Interfaces" introduced="^2" class="api">
-      <unit bldFile="mw/opensrv/opensrv_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
+    <collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
+     <component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_pub/synchronization_capability_api/group"/>
+     </component>
+    </collection>
+    <collection name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" level="specific">
+     <component name="common_agent_util_and_definitions_api" long-name="Common Agent util and definitions API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/group"/>
+     </component>
+     <component name="policy_management_certificate_api" long-name="Policy Management Certificate API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/group"/>
+     </component>
+     <component name="oma_provisioning_adapter_api" long-name="OMA Provisioning Adapter API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_adapter_api/group"/>
+     </component>
+     <component name="device_management_parameter_api" long-name="Device Management Parameter API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_parameter_api/group"/>
+     </component>
+     <component name="data_synchronization_plugin_api" long-name="Data Synchronization Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/group"/>
+     </component>
+     <component name="sync_alert_handler_api" long-name="Sync Alert Handler API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_alert_handler_api/group"/>
+     </component>
+     <component name="syncml_notifier_api" long-name="SyncML Notifier API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_api/group"/>
+     </component>
+     <component name="syncml_client_api" long-name="SyncML Client API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_client_api/group"/>
+     </component>
+     <component name="device_management_plugin_api" long-name="Device Management plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/device_management_plugin_api/group"/>
+     </component>
+     <component name="dm_tree_apis" long-name="DM Tree APIs" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_tree_apis/group"/>
+     </component>
+     <component name="terminal_security_device_lock_api" long-name="Terminal Security Device Lock API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/group"/>
+     </component>
+     <component name="policy_management_request_api" long-name="Policy Management Request API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/policy_management_request_api/group"/>
+     </component>
+     <component name="ds_constant_definitions_api" long-name="DS Constant Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_constant_definitions_api/group"/>
+     </component>
+     <component name="scp_server_api" long-name="SCP Server API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/scp_server_api/group"/>
+     </component>
+     <component name="data_synchronization_notification_api" long-name="Data Synchronization Notification API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/data_synchronization_notification_api/group"/>
+     </component>
+     <component name="oma_provisioning_engine_api" long-name="OMA Provisioning Engine API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/group"/>
+     </component>
+     <component name="dm_utils_api" long-name="DM Utils API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_utils_api/group"/>
+     </component>
+     <component name="syncml_alert_api" long-name="SyncML Alert API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_alert_api/group"/>
+     </component>
+     <component name="obex_client_session_api" long-name="OBEX Client session API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/obex_client_session_api/group"/>
+     </component>
+     <component name="setting_enforcement_info_api" long-name="Setting Enforcement Info API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/group"/>
+     </component>
+     <component name="dm_constant_definitions_api" long-name="DM Constant Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_constant_definitions_api/group"/>
+     </component>
+     <component name="oma_ds_extensions_api" long-name="OMA DS Extensions API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/group"/>
+     </component>
+     <component name="pnpms_utils_api" long-name="PNPMS Utils API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/group"/>
+     </component>
+     <component name="diagnostics_plugin_utility_api" long-name="Diagnostics Plugin Utility API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
+     </component>
+     <component name="diagnostics_plugin_api" long-name="Diagnostics Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_api/group"/>
+     </component>
+     <component name="diagnostics_framework_api" long-name="Diagnostics Framework API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_framework_api/group"/>
+     </component>
+     <component name="diagnostics_results_api" long-name="Diagnostics Results API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_results_api/group"/>
+     </component>
+     <component name="diagnostics_plugin_pool_api" long-name="Diagnostics Plugin Pool API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
+     </component>
+     <component name="adaptive_history_list_api" long-name="Adaptive History List API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_api/group"/>
+     </component>
+     <component name="adaptive_history_list_session_api" long-name="Adaptive History List Session API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/adaptive_history_list_session_api/group"/>
+     </component>
+     <component name="fota_engine_api" long-name="FOTA Engine API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/fota_engine_api/group"/>
+     </component>
+     <component name="update_package_storage_plugin_api" long-name="Update Package Storage Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/update_package_storage_plugin_api/group"/>
+     </component>
+     <component name="syncml_notifier_roaming_api" long-name="SyncML Notifier Roaming API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/syncml_notifier_roaming_api/group"/>
+     </component>
+     <component name="sync_service_api" long-name="Sync Service API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/sync_service_api/group"/>
+     </component>
+     <component name="dcmo_adapter_api" long-name="DCMO Adapter API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_adapter_api/group"/>
+     </component>
+     <component name="dcmo_control_api" long-name="DCMO Control API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dcmo_control_api/group"/>
+     </component>
+     <component name="ds_capability_mgmt_plugin_api" long-name="DS Capability Management Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
+     </component>
+     <component name="dm_native_notifier_api" long-name="DM Native Notifier API" filter="s60" class="api">
+      <unit bldFile="mw/remotemgmt/remotemgmt_plat/dm_native_notifier_api/group"/>
+     </component>
+    </collection>
     <collection name="policymanagement" long-name="Policy Management" level="generic">
      <component name="pmdmadapter" filter="s60" long-name="PM DM Adapter" plugin="Y">
       <unit bldFile="mw/remotemgmt/policymanagement/pmdmadapter/group"/>
@@ -3367,16 +4932,13 @@
       <!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
      </component>
     </collection>
-    <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
-     <component name="remotemgmt_plat" filter="s60" long-name="Remote Management Platform Interfaces" class="api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_plat/group"/>
-     </component>
-     <component name="remotemgmt_pub" filter="s60" long-name="Remote Management Public Interfaces" class="api">
-      <unit bldFile="mw/remotemgmt/remotemgmt_pub/group"/>
-     </component>
-    </collection>
    </block>
    <block name="remotestorage" level="generic" long-name="Remote Storage" levels="framework if">
+    <collection name="rsfw_plat" long-name="Remote Storage Platform Interfaces" level="if">
+     <component name="rsfw_access_protocol_plugin_api" filter="s60" long-name="Remote Storage Framework Access Protocol Plugin API" class="api">
+      <unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
+     </component>
+    </collection>
     <collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
      <component name="mountstore" filter="s60" long-name="RSFW Mount Store">
       <unit bldFile="mw/remotestorage/remotestoragefw/mountstore/group"/>
@@ -3410,11 +4972,6 @@
       <unit bldFile="mw/remotestorage/remotestoragefw/group"/>
      </component>
     </collection>
-    <collection name="remotestorage_info" long-name="Remote Storage Info" level="if">
-     <component name="rsfw_plat" filter="s60" long-name="Remote Storage Platform Interfaces" class="api">
-      <unit bldFile="mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-     </component>
-    </collection>
    </block>
    <block name="remoteconn" level="generic" long-name="Remote Connectivity" levels="plugin framework server generic specific">
     <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
@@ -3423,9 +4980,6 @@
      </component>
     </collection>
     <collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-     <component name="remoteconn_plat" filter="s60" long-name="Remote Connectivity Platform Interfaces" class="api">
-      <unit bldFile="mw/remoteconn/remoteconn_plat/group"/>
-     </component>
      <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
      </component>
@@ -3475,15 +5029,32 @@
     </collection>
    </block>
    <block name="srvdiscovery" level="generic" long-name="Service Discovery and Usage" levels="plugin framework server generic specific">
+    <collection name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" level="specific">
+     <component name="upnpstack_plat" long-name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_device_api/group"/>
+     </component>
+     <component name="upnpstack_plat" long-name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_common_api/group"/>
+     </component>
+     <component name="upnpstack_plat" long-name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_utils_api/group"/>
+     </component>
+     <component name="upnpstack_plat" long-name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_control_point_api/group"/>
+     </component>
+     <component name="upnpstack_plat" long-name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_httpserver_api/group"/>
+     </component>
+     <component name="upnpstack_plat" long-name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+      <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
+     </component>
+    </collection>
     <collection name="servicediscoveryandcontrol" long-name="Service Discovery and Control" level="framework">
      <component name="servicediscoveryfw" long-name="Service Discovery Framework" introduced="^3" purpose="optional">
       <unit bldFile="mw/srvdiscovery/servicediscoveryandcontrol/pnp/group" mrp="mw/srvdiscovery/servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
      </component>
     </collection>
     <collection name="upnp" long-name="UPnP" level="server">
-     <component name="upnpstack_plat" long-name="UPnP Stack Platform Interfaces" introduced="^3" purpose="optional" class="api">
-      <unit bldFile="mw/srvdiscovery/upnp/upnpstack_plat/group"/>
-     </component>
      <component name="upnpstack" long-name="UPnP Stack" introduced="^3" purpose="optional">
       <unit bldFile="mw/srvdiscovery/upnp/upnpstack/group"/>
      </component>
@@ -3496,6 +5067,32 @@
    </block>
    <block name="dlnasrv" level="specific" long-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 name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" level="plugin">
+     <component name="upnp_media_server_settings_api" long-name="UPnP Media Server Settings API" filter="s60" class="api">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_settings_api/group"/>
+     </component>
+     <component name="upnp_av_objects_api" long-name="UPnP A/V Objects API" filter="s60" class="api">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_av_objects_api/group"/>
+     </component>
+     <component name="upnp_media_server_api" long-name="UPnP Media Server API" filter="s60" class="api">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_api/group"/>
+     </component>
+     <component name="upnp_security_plugin_api" long-name="UPnP Security Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_security_plugin_api/group"/>
+     </component>
+     <component name="upnp_avcp_api" long-name="UPnP AVCP API" filter="s60" class="api">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_avcp_api/group"/>
+     </component>
+     <component name="upnp_media_server_metadata_api" long-name="UPnP Media Server Metadata API" filter="s60" class="api">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_media_server_metadata_api/group"/>
+     </component>
+     <component name="upnp_command_api" long-name="UPnP Command API" filter="s60" class="api">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_command_api/group"/>
+     </component>
+     <component name="upnp_plugin_api" long-name="UPnP Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/dlnasrv/dlnasrv_plat/upnp_plugin_api/group"/>
+     </component>
+    </collection>
     <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
      <component name="avcontrolframework" filter="s60" long-name="A/V Control Famework" introduced="9.1" deprecated="^3">
       <unit bldFile="mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
@@ -3654,9 +5251,6 @@
      </component>
     </collection>
     <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-     <component name="dlnasrv_plat" filter="s60" long-name="DLNA Services Platform Interfaces" class="api">
-      <unit bldFile="mw/dlnasrv/dlnasrv_plat/group"/>
-     </component>
      <component name="dlnasrv_build" filter="s60" long-name="DLNA Services Build">
       <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
       <unit bldFile="mw/dlnasrv/group"/>
@@ -3664,6 +5258,55 @@
     </collection>
    </block>
    <block name="btservices" level="generic" long-name="Bluetooth Services" levels="framework server generic specific plugin">
+    <collection name="btservices_pub" long-name="BT Services Public Interfaces" level="plugin">
+     <component name="bluetooth_power_state_api" long-name="Bluetooth Power State API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_pub/bluetooth_power_state_api/group"/>
+     </component>
+     <component name="bluetooth_notifier_api" long-name="Bluetooth Notifier API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_pub/bluetooth_notifier_api/group"/>
+     </component>
+    </collection>
+    <collection name="btservices_plat" long-name="BT Services Platform Interfaces" level="plugin">
+     <component name="bluetooth_dosserver_audio_api" long-name="Bluetooth DOS Server Audio API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_dosserver_audio_api/group"/>
+     </component>
+     <component name="bluetooth_dut_mode_api" long-name="Bluetooth DUT Mode API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_dut_mode_api/group"/>
+     </component>
+     <component name="bluetooth_engine_api" long-name="Bluetooth Engine API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_api/group"/>
+     </component>
+     <component name="bluetooth_engine_connection_management_api" long-name="Bluetooth Engine Connection Management API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_connection_management_api/group"/>
+     </component>
+     <component name="bluetooth_engine_device_management_api" long-name="Bluetooth Engine Device Management API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_device_management_api/group"/>
+     </component>
+     <component name="bluetooth_engine_discovery_api" long-name="Bluetooth Engine Discovery API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_discovery_api/group"/>
+     </component>
+     <component name="bluetooth_engine_features_api" long-name="Bluetooth Engine Features API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_features_api/group"/>
+     </component>
+     <component name="bluetooth_engine_settings_api" long-name="Bluetooth Engine Settings API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_settings_api/group"/>
+     </component>
+     <component name="bluetooth_engine_plugin_api" long-name="Bluetooth Engine Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_engine_plugin_api/group"/>
+     </component>
+     <component name="bluetooth_local_variation_api" long-name="Bluetooth Local Variation API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_local_variation_api/group"/>
+     </component>
+     <component name="bluetooth_notifier_internal_api" long-name="Bluetooth Notifier internal API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_notifier_internal_api/group"/>
+     </component>
+     <component name="bluetooth_sap_connection_state_api" long-name="Bluetooth SAP Connection State API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_sap_connection_state_api/group"/>
+     </component>
+     <component name="bluetooth_secondary_display_notification_api" long-name="Bluetooth Secondary Display Notification API" filter="s60" class="api">
+      <unit bldFile="mw/btservices/btservices_plat/bluetooth_secondary_display_notification_api/group"/>
+     </component>
+    </collection>
     <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
      <component name="bteng" filter="s60" long-name="Bluetooth Engine">
       <unit bldFile="mw/btservices/bluetoothengine/bteng/group"/>
@@ -3705,23 +5348,45 @@
      </component>
     </collection>
     <collection name="btservices_info" long-name="BT Services Info" level="plugin">
-     <component name="btservices_plat" filter="s60" long-name="BT Services Platform Interfaces" class="api">
-      <unit bldFile="mw/btservices/btservices_plat/group"/>
-     </component>
-     <component name="btservices_pub" filter="s60" long-name="BT Services Public Interfaces" class="api">
-      <unit bldFile="mw/btservices/btservices_pub/group"/>
-     </component>
      <component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
       <unit mrp="mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
-    <collection name="usbservices_info" long-name="USB Services Info" level="plugin">
-     <component name="usbservices_plat" filter="s60" long-name="USB Services Platform Interfaces" class="api">
-      <unit bldFile="mw/usbservices/usbservices_plat/group"/>
-     </component>
-    </collection>
+    <collection name="usbservices_plat" long-name="USB Services Platform Interfaces" level="plugin">
+     <component name="pictbridge_api" long-name="PictBridge API" filter="s60" class="api">
+      <unit bldFile="mw/usbservices/usbservices_plat/pictbridge_api/group"/>
+     </component>
+     <component name="ptp_responder_api" long-name="PTP Responder API" filter="s60" class="api">
+      <unit bldFile="mw/usbservices/usbservices_plat/ptp_responder_api/group"/>
+     </component>
+     <component name="ptp_transport_api" long-name="PTP Transport API" filter="s60" class="api">
+      <unit bldFile="mw/usbservices/usbservices_plat/ptp_transport_api/group"/>
+     </component>
+     <component name="usb_device_control_plugin_api" long-name="USB Device Control Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/usbservices/usbservices_plat/usb_device_control_plugin_api/group"/>
+     </component>
+     <component name="usb_notifier_api" long-name="USB Notifier API" filter="s60" class="api">
+      <unit bldFile="mw/usbservices/usbservices_plat/usb_notifier_api/group"/>
+     </component>
+     <component name="usb_personality_api_header" long-name="USB Personality API" filter="s60" class="api">
+      <unit bldFile="mw/usbservices/usbservices_plat/usb_personality_api_header/group"/>
+     </component>
+     <component name="usb_personality_plugin_api" long-name="USB Personality Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/usbservices/usbservices_plat/usb_personality_plugin_api/group"/>
+     </component>
+     <component name="usb_secondary_display_api" long-name="USB Secondary Display API" filter="s60" class="api">
+      <unit bldFile="mw/usbservices/usbservices_plat/usb_secondary_display_api/group"/>
+     </component>
+     <component name="usb_watcher_api" long-name="USB Watcher API" filter="s60" class="api">
+      <unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_api/group"/>
+     </component>
+     <component name="usb_watcher_info_api_header" long-name="USB Watcher Info API" filter="s60" class="api">
+      <unit bldFile="mw/usbservices/usbservices_plat/usb_watcher_info_api_header/group"/>
+     </component>
+    </collection>
+    <collection name="usbservices_info" long-name="USB Services Info" level="plugin"/>
     <collection name="usbengines" long-name="USB Engines" level="generic">
      <component name="usbotgwatcher" filter="s60" long-name="USB OTG Watcher">
       <unit bldFile="mw/usbservices/usbengines/usbotgwatcher/group"/>
@@ -3779,13 +5444,36 @@
      <component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
       <unit bldFile="mw/usbservices/usbuis/imageprintui/group"/>
      </component>
-     <component name="rndisui" filter="s60" long-name="Remote NDIS UI" introduced="^3">
-      <unit bldFile="mw/usbservices/usbuis/rndisui/group"/>
-     </component>
     </collection>
    </block>
    <block name="shortlinkconn" level="generic" long-name="Shortlink Connectivity" levels="framework server generic specific plugin">
     <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
+    <collection name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" level="plugin">
+     <component name="obex_service_utils_api" long-name="OBEX Service Utils API" filter="s60" class="api">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_utils_api/group"/>
+     </component>
+     <component name="obex_service_plugin_api" long-name="OBEX Service Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_service_plugin_api/group"/>
+     </component>
+     <component name="dialup_connection_status_api" long-name="Dial-up Connection Status API" filter="s60" class="api">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dialup_connection_status_api/group"/>
+     </component>
+     <component name="dun_secondary_display_notification_api" long-name="DUN Secondary Display Notification API" filter="s60" class="api">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/dun_secondary_display_notification_api/group"/>
+     </component>
+     <component name="obex_secondary_display_notification_api" long-name="OBEX Secondary Display Notification API" filter="s60" class="api">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/obex_secondary_display_notification_api/group"/>
+     </component>
+     <component name="generic_hid_api" long-name="Generic HID API" filter="s60" class="api">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/generic_hid_api/group"/>
+     </component>
+     <component name="locod_bearer_plugin_api" long-name="Locod Bearer Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/locod_bearer_plugin_api/group"/>
+     </component>
+     <component name="usb_obexservicemanager_client_api" long-name="USB OBEX Service Manager Client API" filter="s60" class="api">
+      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/usb_obexservicemanager_client_api/group"/>
+     </component>
+    </collection>
     <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
      <component name="locod" long-name="Local Connectivity Daemon">
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/locod/group"/>
@@ -3821,13 +5509,19 @@
       <unit bldFile="mw/shortlinkconn/localconnectivityservice/headset/group"/>
      </component>
     </collection>
-    <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
-     <component name="shortlinkconn_plat" filter="s60" long-name="Shortlink Connectivity Platform Interfaces" class="api">
-      <unit bldFile="mw/shortlinkconn/shortlinkconn_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="imghandling" level="specific" long-name="Image Handling" levels="lib util if">
+    <collection name="imagehandling_plat" long-name="Image Handling Platform Interfaces" level="if">
+     <component name="image_handling_library_api" long-name="Image Handling Library API" filter="s60" class="api">
+      <unit bldFile="mw/imghandling/imagehandling_plat/image_handling_library_api/group"/>
+     </component>
+     <component name="3gp_library_api" long-name="3GP Library API" filter="s60" class="api">
+      <unit bldFile="mw/imghandling/imagehandling_plat/3gp_library_api/group"/>
+     </component>
+     <component name="thumbnailmanager_api" long-name="Thumbnail Manager API" filter="s60" class="api">
+      <unit bldFile="mw/imghandling/imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+     </component>
+    </collection>
     <collection name="imagehandlinglib" long-name="Image Handling Library" level="lib">
      <!-- collection is really a component, need to move down a directory -->
      <component name="ihl" filter="s60" long-name="IHL">
@@ -3839,28 +5533,60 @@
       <unit bldFile="mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
      </component>
     </collection>
-    <collection name="imghandling_info" long-name="Image Handling Info" level="if">
-     <component name="imagehandling_plat" filter="s60" long-name="Image Handling Platform Interfaces" class="api">
-      <unit bldFile="mw/imghandling/imagehandling_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="metadatasrv" level="specific" long-name="Legacy Metadata Services" levels="plugin framework server generic specific">
+    <collection name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" level="specific">
+     <component name="content_listing_framework_api" long-name="Content Listing Framework API" filter="s60" class="api">
+      <unit bldFile="mw/metadatasrv/metadatasrv_pub/content_listing_framework_api/group"/>
+     </component>
+     <component name="media_fetch_api" long-name="Media Fetch API" filter="s60" class="api">
+      <unit bldFile="mw/metadatasrv/metadatasrv_pub/media_fetch_api/group"/>
+     </component>
+    </collection>
+    <collection name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" level="specific">
+     <component name="media_fetch_implementation_api" long-name="Media Fetch Implementation API" filter="s60" class="api">
+      <unit bldFile="mw/metadatasrv/metadatasrv_plat/media_fetch_implementation_api/group"/>
+     </component>
+     <component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" filter="s60" class="api">
+      <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>
+     </component>
+     <component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" filter="s60" class="api">
+      <unit bldFile="mw/metadatasrv/metadatasrv_plat/content_listing_framework_extended_api/group"/>
+     </component>
+    </collection>
     <collection name="mediamanagementutilities" long-name="Media Management Utilities" level="generic">
      <component name="mediafetch" filter="s60" long-name="Media Fetch">
       <unit bldFile="mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
      </component>
     </collection>
-    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
-     <component name="metadatasrv_plat" filter="s60" long-name="Legacy Metadata Services Platform Interfaces" class="api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_plat/group"/>
-     </component>
-     <component name="metadatasrv_pub" filter="s60" long-name="Legacy Metadata Services Public Interfaces" class="api">
-      <unit bldFile="mw/metadatasrv/metadatasrv_pub/group"/>
-     </component>
-    </collection>
    </block>
    <block name="mds" level="specific" long-name="Metadata Services" levels="mgr eng server int">
+    <collection name="mds_plat" long-name="Metadata Services Platform Interfaces" level="int">
+     <component name="context_engine_plugin_api" long-name="Context Engine Plugin API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="mw/mds/mds_plat/context_engine_plugin_api/group" filter="!test"/>
+     </component>
+     <component name="harvester_framework_api" long-name="Harvester Framework API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="mw/mds/mds_plat/harvester_framework_api/group" filter="!test"/>
+      <!-- can only have one unit with the same filter, #include the following from the previous unit -->
+     </component>
+     <component name="location_manager_api" long-name="Location Manager API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="mw/mds/mds_plat/location_manager_api/group" filter="!test"/>
+     </component>
+     <component name="metadata_engine_api" long-name="Metadata Engine API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="mw/mds/mds_plat/metadata_engine_api/group" filter="!test"/>
+     </component>
+     <component name="content_listing_framework_collection_manager_api" long-name="Content Listing Framework Collection Manager API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="mw/mds/mds_plat/content_listing_framework_collection_manager_api/group" filter="!test"/>
+     </component>
+     <component name="content_listing_framework_extended_api" long-name="Content Listing Framework Extended API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="mw/mds/mds_plat/content_listing_framework_extended_api/group"/>
+     </component>
+    </collection>
+    <collection name="mds_pub" long-name="Metadata Services Public Interfaces" level="int">
+     <component name="content_listing_framework_api" long-name="Content Listing Framework API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="mw/mds/mds_pub/content_listing_framework_api/group" filter="!test"/>
+     </component>
+    </collection>
     <collection name="metadataengine" long-name="Metadata Engine" level="eng">
      <component name="metadataengine_common" filter="s60" long-name="Metadata Engine Common" introduced="^2">
       <unit bldFile="mw/mds/metadataengine/common/group"/>
@@ -3944,23 +5670,64 @@
      </component>
     </collection>
     <collection name="mds_info" long-name="Metadata Services Info" level="int">
-     <component name="mds_pub" filter="s60" long-name="Metadata Services Public Interfaces" introduced="^2" class="api">
-      <unit bldFile="mw/mds/mds_pub/group"/>
-     </component>
-     <component name="mds_plat" filter="s60" long-name="Metadata Services Platform Interfaces" introduced="^2" class="api">
-      <unit bldFile="mw/mds/mds_plat/group"/>
-     </component>
      <component name="mds_build" filter="s60" long-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>
    </block>
-   <block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui">
+   <block name="mmuifw" level="specific" long-name="Multimedia UI Framework" levels="mgr mdl util ui api">
+    <collection name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" level="api">
+     <component name="alf_widgetfactory_api" long-name="ALF Widget Factory API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetfactory_api/group"/>
+     </component>
+     <component name="alf_widgetutils_api" long-name="ALF Widget Utils API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetutils_api/group"/>
+     </component>
+     <component name="alf_widgetmodel_api" long-name="ALF Widget Model API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_widgetmodel_api/group"/>
+     </component>
+     <component name="osn_container_api" long-name="OSN Container API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_container_api/group"/>
+     </component>
+     <component name="osn_global_api" long-name="OSN Global API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_global_api/group"/>
+     </component>
+     <component name="osn_string_api" long-name="OSN String API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/osn_string_api/group"/>
+     </component>
+     <component name="alf_resourcepool_api" long-name="ALF Resource Pool API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_resourcepool_api/group"/>
+     </component>
+     <component name="alf_containerwidget_api" long-name="ALF Container Widget API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_containerwidget_api/group"/>
+     </component>
+     <component name="alf_viewwidget_api" long-name="ALF View Widget API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_viewwidget_api/group"/>
+     </component>
+     <component name="alf_scrollbarwidget_api" long-name="ALF Scrollbar Widget API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_scrollbarwidget_api/group"/>
+     </component>
+     <component name="alf_customlayoutmanagers_api" long-name="ALF Custom Layout Managers API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/alf_customlayoutmanagers_api/group"/>
+     </component>
+     <component name="gesturehelper_api" long-name="Gesture Helper API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/gesturehelper_api/group"/>
+     </component>
+     <component name="mul_coverflowwidget_api" long-name="MUL Coverflow Widget API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_coverflowwidget_api/group"/>
+     </component>
+     <component name="mul_datamodel_api" long-name="MUL Data Model API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_datamodel_api/group"/>
+     </component>
+     <component name="mul_sliderwidget_api" long-name="MUL Slider Widget API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_sliderwidget_api/group"/>
+     </component>
+     <component name="mul_widget_api" long-name="MUL Widget API" filter="s60" class="api">
+      <unit bldFile="mw/mmuifw/mmuifw_plat/mul_widget_api/group"/>
+     </component>
+    </collection>
     <collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
-     <component name="mmuifw_plat" filter="s60" long-name="Multimedia UI Framework Platform Interfaces" class="api">
-      <unit bldFile="mw/mmuifw/mmuifw_plat/group"/>
-     </component>
      <component name="mmuifw_build" filter="s60" long-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"/>
@@ -4022,6 +5789,17 @@
     </collection>
    </block>
    <block name="videoutils" level="specific" long-name="Video Utils" levels="eng util if">
+    <collection name="videoutils_plat" long-name="Video Utils Platform Interfaces" level="if">
+     <component name="videoscheduler_api" long-name="Video Scheduler API" filter="s60" class="api">
+      <unit bldFile="mw/videoutils/videoutils_plat/videoscheduler_api/group"/>
+     </component>
+     <component name="videoconnutility_api" long-name="Video Connection Utility API" filter="s60" class="api">
+      <unit bldFile="mw/videoutils/videoutils_plat/videoconnutility_api/group"/>
+     </component>
+     <component name="videoplayer_constants_api" long-name="Videoplayer Constants API" filter="s60" class="api">
+      <unit bldFile="mw/videoutils/videoutils_plat/videoplayer_constants_api/group"/>
+     </component>
+    </collection>
     <collection name="videoscheduler" long-name="Video Scheduler" level="util">
      <component name="schedulerclient" filter="s60" long-name="Video Scheduler Client">
       <unit bldFile="mw/videoutils/videoscheduler/schedulerclient/group"/>
@@ -4038,13 +5816,83 @@
       <unit bldFile="mw/videoutils/videoconnutility/connutility/group"/>
      </component>
     </collection>
-    <collection name="videoutils_info" long-name="Video Utils Info" level="if">
-     <component name="videoutils_plat" filter="s60" long-name="Video Utils Platform Interfaces" class="api">
-      <unit bldFile="mw/videoutils/videoutils_plat/group"/>
-     </component>
-    </collection>
+    <collection name="videoutils_info" long-name="Video Utils Info" level="if"/>
    </block>
    <block name="mmmw" level="generic" long-name="Multimedia Middleware" levels="plugin framework server generic specific">
+    <collection name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" level="specific">
+     <component name="multimedia_data_source_api" long-name="Multimedia Data Source API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/multimedia_data_source_api/group"/>
+     </component>
+     <component name="progressive_download_api" long-name="Progressive Download API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/progressive_download_api/group"/>
+     </component>
+     <component name="equalizer_ui_api" long-name="Equalizer UI API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/equalizer_ui_api/group"/>
+     </component>
+     <component name="enhanced_media_client_api" long-name="Enhanced Media Client API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/enhanced_media_client_api/group"/>
+     </component>
+     <component name="stream_control_custom_command_api" long-name="Stream Control Custom Command API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/stream_control_custom_command_api/group"/>
+     </component>
+     <component name="emc_buffer_source_api" long-name="EMC Buffer Source API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/emc_buffer_source_api/group"/>
+     </component>
+     <component name="emc_file_source_api" long-name="EMC File Source API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/emc_file_source_api/group"/>
+     </component>
+     <component name="audio_metadata_reader_api" long-name="Audio MetaData Reader API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_metadata_reader_api/group"/>
+     </component>
+     <component name="emc_progressive_download_source_api" long-name="EMC Progressive Download Source API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/emc_progressive_download_source_api/group"/>
+     </component>
+     <component name="emc_volume_effect_api" long-name="EMC Volume Effect API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/emc_volume_effect_api/group"/>
+     </component>
+     <component name="emc_balance_effect_api" long-name="EMC Balance Effect API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/emc_balance_effect_api/group"/>
+     </component>
+     <component name="emc_descriptor_source_api" long-name="EMC Descriptor Source API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/emc_descriptor_source_api/group"/>
+     </component>
+     <component name="emc_drm_config_intfc_api" long-name="EMC DRM Config Intfc API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/emc_drm_config_intfc_api/group"/>
+     </component>
+     <component name="voip_audio_services_api" long-name="VoIP Audio Services" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/voip_audio_services_api/group"/>
+     </component>
+     <component name="configuration_components_factory_api" long-name="Configuration Components Factory API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/configuration_components_factory_api/group"/>
+     </component>
+     <component name="audio_output_control_utility_api" long-name="Audio Output Control Utility API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_api/group"/>
+     </component>
+     <component name="audio_output_control_utility_proxy_api" long-name="Audio Output Control Utility Proxy API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/audio_output_control_utility_proxy_api/group"/>
+     </component>
+     <component name="emc_audio_effects_api" long-name="EMC Audio Effects API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/emc_audio_effects_api/group"/>
+     </component>
+     <component name="call_audio_control_api" long-name="Call AudioControl API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/call_audio_control_api/group"/>
+     </component>
+     <component name="radio_utilities_api" long-name="Radio Utilities API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/radio_utilities_api/group"/>
+     </component>
+     <component name="radio_preset_utilities_api" long-name="Radio Preset Utilities API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/radio_preset_utilities_api/group"/>
+     </component>
+     <component name="radio_monitor_api" long-name="Radio Monitor API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/radio_monitor_api/group"/>
+     </component>
+     <component name="thumbnail_engine_api" long-name="Thumbnail Engine API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/thumbnail_engine_api/group"/>
+     </component>
+     <component name="telephony_multimedia_service_api" long-name="Telephony Multimedia Service API" filter="s60" class="api">
+      <unit bldFile="mw/mmmw/mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
+     </component>
+    </collection>
     <collection name="mmfenh" long-name="MMF Enhancements" level="generic">
      <component name="advancedaudiocontroller" filter="s60" long-name="Advanced Audio Controllers" plugin="Y">
       <unit bldFile="mw/mmmw/mmfenh/advancedaudiocontroller/group"/>
@@ -4099,9 +5947,6 @@
      </component>
     </collection>
     <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-     <component name="mmmw_plat" filter="s60" long-name="Multimedia Middleware Platform Interfaces" class="api">
-      <unit bldFile="mw/mmmw/mmmw_plat/group"/>
-     </component>
      <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
      </component>
@@ -4116,6 +5961,32 @@
     </collection>
    </block>
    <block name="camerasrv" level="specific" long-name="Camera Services" levels="plugin fw api">
+    <collection name="camerasrv_plat" long-name="Camera Services Platform Interfaces" level="api">
+     <component name="media_recorder_sink_api" long-name="Media Recorder Sink API" filter="s60" class="api">
+      <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_sink_api/group"/>
+     </component>
+     <component name="cae_extentension_api" long-name="CAE Extension API" filter="s60" class="api">
+      <unit bldFile="mw/camerasrv/camerasrv_plat/cae_extentension_api/group"/>
+     </component>
+     <component name="camera_application_engine_api" long-name="Camera Application Engine API" filter="s60" class="api">
+      <unit bldFile="mw/camerasrv/camerasrv_plat/camera_application_engine_api/group" filter="!test"/>
+     </component>
+     <component name="custom_onboard_camera_api" long-name="Custom Onboard Camera API" filter="s60" class="api">
+      <unit bldFile="mw/camerasrv/camerasrv_plat/custom_onboard_camera_api/group"/>
+     </component>
+     <component name="imaging_configuration_manager_api" long-name="Imaging Configuration Manager API" filter="s60" class="api">
+      <unit bldFile="mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/group" filter="!test"/>
+     </component>
+     <component name="media_recorder_api" long-name="Media Recorder API" filter="s60" class="api">
+      <unit bldFile="mw/camerasrv/camerasrv_plat/media_recorder_api/group" filter="!test"/>
+     </component>
+     <component name="3gp_file_composer_api" long-name="3GP File Composer API" filter="s60" class="api">
+      <unit bldFile="mw/camerasrv/camerasrv_plat/3gp_file_composer_api/group"/>
+     </component>
+     <component name="asynchronous_file_saving_queue_api" long-name="Asynchronous File Saving Queue API" filter="s60" class="api">
+      <unit bldFile="mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/group" filter="!test"/>
+     </component>
+    </collection>
     <collection name="camappengine" long-name="Camera App Engine" level="fw">
      <!-- is this collection really a component? If so, move down a directory -->
      <component name="stillconverter" filter="s60" long-name="Still Image Converter" class="placeholder">
@@ -4145,9 +6016,6 @@
      </component>
     </collection>
     <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-     <component name="camerasrv_plat" filter="s60" long-name="Camera Services Platform Interfaces" class="api">
-      <unit bldFile="mw/camerasrv/camerasrv_plat/group"/>
-     </component>
      <component name="camerasrv_build" filter="s60" long-name="Camera Services Build">
       <!-- should split into individual bld.infs -->
       <unit bldFile="mw/camerasrv/group"/>
@@ -4155,6 +6023,74 @@
     </collection>
    </block>
    <block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
+    <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
+     <component name="inc" long-name="Inc" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/inc/mmappfwbldvariant.hrh"/>
+     </component>
+     <component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
+     </component>
+     <component name="harvester_collection_mediator_api" long-name="Harvester Collection Mediator API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/group"/>
+     </component>
+     <component name="harvester_metadata_extractor_api" long-name="Harvester Metadata Extractor API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/group"/>
+     </component>
+     <component name="harvester_server_api" long-name="Harvester Server API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_server_api/group"/>
+     </component>
+     <component name="harvester_utility_api" long-name="Harvester Utility API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/harvester_utility_api/group"/>
+     </component>
+     <component name="playlist_engine_api" long-name="Playlist Engine API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/playlist_engine_api/group"/>
+     </component>
+     <component name="mtp_keys_api" long-name="MTP Keys API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mtp_keys_api/group"/>
+     </component>
+     <component name="mpx_collection_common_definition_api" long-name="MPX Collection Common Definition API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_common_definition_api/group"/>
+     </component>
+     <component name="mpx_collection_utility_api" long-name="MPX Collection Utility API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/group"/>
+     </component>
+     <component name="mpx_common_api" long-name="MPX Common API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_api/group"/>
+     </component>
+     <component name="mpx_common_definition_api" long-name="MPX Common Definition API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_common_definition_api/group"/>
+     </component>
+     <component name="mpx_playback_common_definition_api" long-name="MPX Playback Common Definition API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_common_definition_api/group"/>
+     </component>
+     <component name="mpx_playback_utility_api" long-name="MPX Playback Utility API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/group"/>
+     </component>
+     <component name="mpx_base_view_plugins_api" long-name="MPX Base View Plugins API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/group"/>
+     </component>
+     <component name="mpx_view_utility_api" long-name="MPX View Utility API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_view_utility_api/group"/>
+     </component>
+     <component name="mpx_albumart_utility_api" long-name="MPX Album Art Utility API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/group"/>
+     </component>
+     <component name="media_player_settings_engine_api" long-name="Media Player Settings Engine API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/group"/>
+     </component>
+     <component name="mpx_backstepping_utility_api" long-name="MPX Backstepping Utility API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/mpx_backstepping_utility_api/group"/>
+     </component>
+     <component name="asx_parser_api" long-name="ASX Parser API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/asx_parser_api/group"/>
+     </component>
+     <component name="playback_helper_api" long-name="Playback Helper API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/playback_helper_api/group"/>
+     </component>
+     <component name="videoplaylist_utility_api" long-name="Video Playlist Utility API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/mmappfw/mmappfw_plat/videoplaylist_utility_api/group"/>
+     </component>
+    </collection>
     <collection name="mpx" long-name="Multimedia Player" level="fw">
      <component name="commonframework" filter="s60" long-name="MPX Common Framework" introduced="^1">
       <unit bldFile="mw/mmappfw/mpx/commonframework/group"/>
@@ -4218,12 +6154,49 @@
       <unit bldFile="mw/mmappfw/group"/>
      </component>
      <component name="mmappfw_test" filter="s60,test,api_test,pref_test" long-name="Multimedia App Framework Test" purpose="development" introduced="^1"/>
-     <component name="mmappfw_plat" filter="s60" long-name="Multimedia App Framework Platform Interfaces" introduced="^1" class="api">
-      <unit bldFile="mw/mmappfw/mmappfw_plat/group"/>
-     </component>
-    </collection>
-   </block>
-   <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework">
+    </collection>
+   </block>
+   <block name="inputmethods" level="generic" long-name="Input Methods" levels="plugin engine framework api">
+    <collection name="inputmethods_pub" long-name="Input Methods Public Interfaces" level="api">
+     <component name="ptiengine_iti_api" long-name="PTI Engine API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_pub/ptiengine_iti_api/group"/>
+     </component>
+     <component name="optical_character_recognition_api" long-name="Optical Character Recognition API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_pub/optical_character_recognition_api/group"/>
+     </component>
+     <component name="input_language_info_api" long-name="Input Language Info API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_pub/input_language_info_api/group"/>
+     </component>
+    </collection>
+    <collection name="inputmethods_plat" long-name="Input Methods Platform Interfaces" level="api">
+     <component name="pen_input_server_api" long-name="Pen Input Server API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_plat/pen_input_server_api/group" filter="!test"/>
+     </component>
+     <component name="ptiengine_hwr_api" long-name="PTI Engine Handwriting Recognition API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/group" filter="!test"/>
+     </component>
+     <component name="aknfep_settings_api" long-name="Avkon FEP Settings API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_settings_api/group"/>
+     </component>
+     <component name="aknfep_status_api" long-name="Avkon FEP Status API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_status_api/group"/>
+     </component>
+     <component name="ptiengine_key_definations_api" long-name="PTI Engine Key Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/group"/>
+     </component>
+     <component name="aknfep_definitions_api" long-name="Avkon FEP Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_definitions_api/group"/>
+     </component>
+     <component name="aknfep_pen_support_api" long-name="Avkon FEP Pen Support API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_pen_support_api/group"/>
+     </component>
+     <component name="ptiengine_indic_definitions_api" long-name="PTI Engine Indic Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_plat/ptiengine_indic_definitions_api/group"/>
+     </component>
+     <component name="aknfep_uiinterface_api" long-name="Avkon FEP UI Interface API" filter="s60" class="api">
+      <unit bldFile="mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/group" filter="!test"/>
+     </component>
+    </collection>
     <collection name="textinput" long-name="Text Input" level="framework">
      <component name="ptienginev2" filter="s60" long-name="Predictive Text Input Engine">
       <!--uncomment when configuration is turned on and textinput_build is removed-->
@@ -4305,13 +6278,7 @@
       <unit bldFile="mw/inputmethods/fep/frontendprocessor/group" mrp="mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
      </component>
     </collection>
-    <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
-     <component name="inputmethods_plat" filter="s60" long-name="Input Methods Platform Interfaces" class="api">
-      <unit bldFile="mw/inputmethods/inputmethods_plat/group"/>
-     </component>
-     <component name="inputmethods_pub" filter="s60" long-name="Input Methods Public Interfaces" class="api">
-      <unit bldFile="mw/inputmethods/inputmethods_pub/group"/>
-     </component>
+    <collection name="inputmethods_info" long-name="Input Methods Info" level="api">
      <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
      </component>
@@ -4319,6 +6286,468 @@
    </block>
    <block name="qt" level="generic" long-name="Qt"/>
    <block name="classicui" level="generic" long-name="Classic UI" levels="base support server generic specific">
+    <collection name="classicui_plat" long-name="Classic UI Platform Interfaces" level="specific">
+     <component name="personalisation_framework_api" long-name="Personalisation Framework API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/personalisation_framework_api/group" filter="!test"/>
+     </component>
+     <component name="signal_pane_api" long-name="Signal Pane API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/signal_pane_api/group" filter="!test"/>
+     </component>
+     <component name="japanese_reading_api" long-name="Japanese Reading API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/japanese_reading_api/group" filter="!test"/>
+     </component>
+     <component name="global_popup_priority_controller_api" long-name="Global Popup Priority Controller API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
+     </component>
+     <component name="item_finder_api" long-name="Item Finder API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/item_finder_api/group" filter="!test"/>
+     </component>
+     <component name="avkon_fonts_api" long-name="Avkon Fonts API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/avkon_fonts_api/group" filter="!test"/>
+     </component>
+     <component name="extended_utilities_api" long-name="Extended Utilities API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_utilities_api/group" filter="!test"/>
+     </component>
+     <component name="personalisation_plugin_api" long-name="Personalisation Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/personalisation_plugin_api/group"/>
+     </component>
+     <component name="extended_aiw_criteria_api" long-name="Extended AIW Criteria API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
+     </component>
+     <component name="personalisation_application_api" long-name="Personalisation Application API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/personalisation_application_api/group"/>
+     </component>
+     <component name="volume_popup_api" long-name="Volume Popup API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/volume_popup_api/group" filter="!test"/>
+     </component>
+     <component name="avkon_secondary_display_support_api" long-name="AVKON Secondary Display Support API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_support_api/group" filter="!test"/>
+     </component>
+     <component name="extended_setting_pages_api" long-name="Extended Setting Pages API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_setting_pages_api/group" filter="!test"/>
+     </component>
+     <component name="extended_lists_api" long-name="Extended Lists API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_lists_api/group" filter="!test"/>
+     </component>
+     <component name="input_block_api" long-name="Input Block API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/input_block_api/group" filter="!test"/>
+     </component>
+     <component name="avkon_ui_server_api" long-name="AVKON UI Server API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/avkon_ui_server_api/group" filter="!test"/>
+     </component>
+     <component name="number_grouping_api" long-name="Number Grouping API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/number_grouping_api/group" filter="!test"/>
+     </component>
+     <component name="extended_status_pane_api" long-name="Extended Status Pane API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_status_pane_api/group" filter="!test"/>
+     </component>
+     <component name="extended_notifiers_api" long-name="Extended Notifiers API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_notifiers_api/group" filter="!test"/>
+     </component>
+     <component name="task_list_api" long-name="Task List API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/task_list_api/group" filter="!test"/>
+     </component>
+     <component name="personalisation_slide_show_dialog_api" long-name="Personalisation Slide Show Dialog API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/personalisation_slide_show_dialog_api/group"/>
+     </component>
+     <component name="key_event_utilities_api" long-name="Key Event Utilities API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/key_event_utilities_api/group"/>
+     </component>
+     <component name="emergency_call_support_api" long-name="Emergency Call Support API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/emergency_call_support_api/group" filter="!test"/>
+     </component>
+     <component name="extended_dialogs_api" long-name="Extended Dialogs API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_dialogs_api/group"/>
+     </component>
+     <component name="legacy_ui_framework_headers_api" long-name="Legacy UI Framework Headers API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/legacy_ui_framework_headers_api/group"/>
+     </component>
+     <component name="extended_editors_api" long-name="Extended Editors API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_editors_api/group" filter="!test"/>
+     </component>
+     <component name="alarm_api" long-name="Alarm API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/alarm_api/group" filter="!test"/>
+     </component>
+     <component name="aiw_service_interface_base_api" long-name="AIW Service Interface Base API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_base_api/group" filter="!test"/>
+     </component>
+     <component name="list_effects_api" long-name="List Effects API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/list_effects_api/group" filter="!test"/>
+     </component>
+     <component name="find_item_ui_api" long-name="Find Item UI API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/find_item_ui_api/group" filter="!test"/>
+     </component>
+     <component name="server_application_services_api" long-name="Server Application Services API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/server_application_services_api/group" filter="!test"/>
+     </component>
+     <component name="common_ui_settings_api" long-name="Common UI Settings API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/common_ui_settings_api/group"/>
+     </component>
+     <component name="aiw_service_interface_menu_api" long-name="AIW Service Interface Menu API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/aiw_service_interface_menu_api/group" filter="!test"/>
+     </component>
+     <component name="eikon_server_extension_client_api" long-name="EIKON Server Extension Client API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/eikon_server_extension_client_api/group" filter="!test"/>
+     </component>
+     <component name="skinnable_clock_api" long-name="Skinnable Clock API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/skinnable_clock_api/group" filter="!test"/>
+     </component>
+     <component name="battery_pane_api" long-name="Battery Pane API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/battery_pane_api/group" filter="!test"/>
+     </component>
+     <component name="fep_document_navigation_api" long-name="FEP Document Navigation API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/fep_document_navigation_api/group"/>
+     </component>
+     <component name="personalisation_localised_texts_api" long-name="Personalisation Localised Texts API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/personalisation_localised_texts_api/group"/>
+     </component>
+     <component name="memory_card_ui_api" long-name="Memory Card UI API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/memory_card_ui_api/group" filter="!test"/>
+     </component>
+     <component name="avkon_status_api" long-name="AVKON Status API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/avkon_status_api/group"/>
+     </component>
+     <component name="application_switching_api" long-name="Application Switching API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/application_switching_api/group" filter="!test"/>
+     </component>
+     <component name="avkon_localised_texts_api" long-name="AVKON Localised Texts API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/avkon_localised_texts_api/group"/>
+     </component>
+     <component name="avkon_secondary_display_api" long-name="AVKON Secondary Display API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/avkon_secondary_display_api/group"/>
+     </component>
+     <component name="extended_animation_api" long-name="Extended Animation API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_animation_api/group" filter="!test"/>
+     </component>
+     <component name="extended_notes_api" long-name="Extended Notes API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
+     </component>
+     <component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
+     </component>
+     <component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
+     </component>
+     <component name="custom_cursors_api" long-name="Custom Cursors API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
+     </component>
+     <component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/screensaver_settings_api/group"/>
+     </component>
+     <component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/global_window_priorities_api/group"/>
+     </component>
+     <component name="extended_indicators_api" long-name="Extended Indicators API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_indicators_api/group" filter="!test"/>
+     </component>
+     <component name="special_character_table_api" long-name="Special Character Table API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/special_character_table_api/group" filter="!test"/>
+     </component>
+     <component name="avkon_settings_api" long-name="AVKON Settings API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/avkon_settings_api/group"/>
+     </component>
+     <component name="extended_sounds_api" long-name="Extended Sounds API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_sounds_api/group"/>
+     </component>
+     <component name="themes_settings_api" long-name="Themes Settings API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/themes_settings_api/group"/>
+     </component>
+     <component name="media_shared_document_api" long-name="Media Shared Document API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/media_shared_document_api/group" filter="!test"/>
+     </component>
+     <component name="extended_queries_api" long-name="Extended Queries API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_queries_api/group"/>
+     </component>
+     <component name="phone_number_text_utilities_api" long-name="Phone Number Text Utilities API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
+     </component>
+     <component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
+     </component>
+     <component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_scroller_api/group"/>
+     </component>
+     <component name="key_rotator_api" long-name="Key Rotator API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/key_rotator_api/group" filter="!test"/>
+     </component>
+     <component name="extended_grids_api" long-name="Extended Grids API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_grids_api/group" filter="!test"/>
+     </component>
+     <component name="generic_parameter_api" long-name="Generic Parameter API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/generic_parameter_api/group" filter="!test"/>
+     </component>
+     <component name="indicator_touch_observer_api" long-name="Indicator Touch Observer API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/indicator_touch_observer_api/group"/>
+     </component>
+     <component name="popup_form_api" long-name="Popup Form API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/popup_form_api/group" filter="!test"/>
+     </component>
+     <component name="stylus_activated_popup_api" long-name="Stylus Activated Pop-up API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/stylus_activated_popup_api/group" filter="!test"/>
+     </component>
+     <component name="indicator_plugin_api" long-name="Indicator Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/indicator_plugin_api/group" filter="!test"/>
+     </component>
+     <component name="layout_configuration_api" long-name="Layout Configuration API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/layout_configuration_api/group" filter="!test"/>
+     </component>
+     <component name="common_file_dialogs_filter_factory_api" long-name="Common File Dialogs Filter Factory API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
+     </component>
+     <component name="avkon_anim_dll_api" long-name="AVKON Anim DLL API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/avkon_anim_dll_api/group"/>
+     </component>
+     <component name="extended_initialization_api" long-name="Extended Initialization API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_initialization_api/group" filter="!test"/>
+     </component>
+     <component name="long_tap_animation_api" long-name="Long Tap Animation API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/long_tap_animation_api/group" filter="!test"/>
+     </component>
+     <component name="extended_ui_framework_definitions_api" long-name="Extended UI Framework Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_ui_framework_definitions_api/group"/>
+     </component>
+     <component name="extended_buttons_api" long-name="Extended Buttons API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_buttons_api/group" filter="!test"/>
+     </component>
+     <component name="aiw_provider_utility_api" long-name="AIW Provider Utility API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/aiw_provider_utility_api/group" filter="!test"/>
+     </component>
+     <component name="transition_effect_parameters_api" long-name="Transition Effect Parameters API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/transition_effect_parameters_api/group" filter="!test"/>
+     </component>
+     <component name="extended_input_capabilities_api" long-name="Extended Input Capabilities API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_input_capabilities_api/group" filter="!test"/>
+     </component>
+     <component name="uikon_status_api" long-name="UIKON Status API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/uikon_status_api/group"/>
+     </component>
+     <component name="transition_effect_utilities_api" long-name="Transition Effect Utilities API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/transition_effect_utilities_api/group" filter="!test"/>
+     </component>
+     <component name="pointer_event_modifier_api" long-name="Pointer Event Modifier API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/pointer_event_modifier_api/group" filter="!test"/>
+     </component>
+     <component name="avkon_testability_api" long-name="AVKON Testability API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/avkon_testability_api/group"/>
+     </component>
+     <component name="ganes_api" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/ganes_api/group"/>
+     </component>
+     <component name="ode_api" long-name="Ode API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/ode_api/group"/>
+     </component>
+     <component name="physics_api" long-name="Physics API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/physics_api/group"/>
+     </component>
+     <component name="touch_pane_api" long-name="Touch Pane API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/touch_pane_api/group" filter="!test"/>
+     </component>
+     <component name="touch_pane_observer_api" long-name="Touch Pane Observer API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/touch_pane_observer_api/group"/>
+     </component>
+     <component name="alternate_fs_api" long-name="Alternate FS API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/alternate_fs_api/group"/>
+     </component>
+     <component name="discreet_popup_api" long-name="Discreet Popup API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/discreet_popup_api/group"/>
+     </component>
+     <component name="touch_gesture_framework_api" long-name="Touch Gesture Framework API" filter="s60" class="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 name="extended_options_menu_api" long-name="Extended Options Menu API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_plat/extended_options_menu_api/group" filter="!test"/>
+     </component>
+    </collection>
+    <collection name="classicui_pub" long-name="Classic UI Public Interfaces" level="specific">
+     <component name="input_frame_api" long-name="Input Frame API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/input_frame_api/group" filter="!test"/>
+     </component>
+     <component name="window_server_event_observer_api" long-name="Window Server Event Observer API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/window_server_event_observer_api/group" filter="!test"/>
+     </component>
+     <component name="application_framework_api" long-name="Application Framework API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/application_framework_api/group" filter="!test"/>
+     </component>
+     <component name="scroller_api" long-name="Scroller API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/scroller_api/group" filter="!test"/>
+     </component>
+     <component name="ui_framework_utilities_api" long-name="UI Framework Utilities API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
+     </component>
+     <component name="ui_framework_definitions_api" long-name="UI Framework Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
+     </component>
+     <component name="buttons_api" long-name="Buttons API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/buttons_api/group" filter="!test"/>
+     </component>
+     <component name="queries_api" long-name="Queries API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/queries_api/group" filter="!test"/>
+     </component>
+     <component name="aiw_generic_parameter_api" long-name="AIW Generic Parameter API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
+     </component>
+     <component name="editors_api" long-name="Editors API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/editors_api/group" filter="!test"/>
+     </component>
+     <component name="common_file_dialogs_api" long-name="Common File Dialogs API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/common_file_dialogs_api/group" filter="!test"/>
+     </component>
+     <component name="dialog_shutter_api" long-name="Dialog Shutter API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/dialog_shutter_api/group" filter="!test"/>
+     </component>
+     <component name="fonts_api" long-name="Fonts API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/fonts_api/group" filter="!test"/>
+     </component>
+     <component name="screen_clearer_api" long-name="Screen Clearer API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/screen_clearer_api/group" filter="!test"/>
+     </component>
+     <component name="notifiers_api" long-name="Notifiers API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/notifiers_api/group" filter="!test"/>
+     </component>
+     <component name="notes_api" long-name="Notes API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
+     </component>
+     <component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
+     </component>
+     <component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
+     </component>
+     <component name="base_controls_api" long-name="Base Controls API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/base_controls_api/group" filter="!test"/>
+     </component>
+     <component name="grids_api" long-name="Grids API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/grids_api/group" filter="!test"/>
+     </component>
+     <component name="context_pane_api" long-name="Context Pane API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/context_pane_api/group" filter="!test"/>
+     </component>
+     <component name="lists_api" long-name="Lists API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/lists_api/group" filter="!test"/>
+     </component>
+     <component name="popups_api" long-name="Popups API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/popups_api/group" filter="!test"/>
+     </component>
+     <component name="misc_controls_api" long-name="Misc Controls API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/misc_controls_api/group" filter="!test"/>
+     </component>
+     <component name="keylock_api" long-name="Keylock API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/keylock_api/group" filter="!test"/>
+     </component>
+     <component name="options_menu_api" long-name="Options Menu API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/options_menu_api/group" filter="!test"/>
+     </component>
+     <component name="hierarchical_lists_api" long-name="Hierarchical Lists API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/hierarchical_lists_api/group" filter="!test"/>
+     </component>
+     <component name="navigation_pane_api" long-name="Navigation Pane API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/navigation_pane_api/group" filter="!test"/>
+     </component>
+     <component name="tabs_api" long-name="Tabs API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/tabs_api/group" filter="!test"/>
+     </component>
+     <component name="title_pane_touch_observer_api" long-name="Title Pane Touch Observer API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/title_pane_touch_observer_api/group"/>
+     </component>
+     <component name="choice_list_api" long-name="Choice List API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/choice_list_api/group" filter="!test"/>
+     </component>
+     <component name="info_popup_note_api" long-name="Info Popup Note API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/info_popup_note_api/group" filter="!test"/>
+     </component>
+     <component name="setting_pages_api" long-name="Setting Pages API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/setting_pages_api/group" filter="!test"/>
+     </component>
+     <component name="screen_mode_api" long-name="Screen Mode API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/screen_mode_api/group" filter="!test"/>
+     </component>
+     <component name="indicators_api" long-name="Indicators API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/indicators_api/group" filter="!test"/>
+     </component>
+     <component name="error_ui_api" long-name="Error UI API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/error_ui_api/group" filter="!test"/>
+     </component>
+     <component name="animation_api" long-name="Animation API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/animation_api/group" filter="!test"/>
+     </component>
+     <component name="searchfield_api" long-name="Searchfield API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/searchfield_api/group" filter="!test"/>
+     </component>
+     <component name="labels_api" long-name="Labels API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/labels_api/group" filter="!test"/>
+     </component>
+     <component name="hotkeys_api" long-name="Hotkeys API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/hotkeys_api/group" filter="!test"/>
+     </component>
+     <component name="initialization_api" long-name="Initialization API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/initialization_api/group" filter="!test"/>
+     </component>
+     <component name="volume_control_api" long-name="Volume Control API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/volume_control_api/group" filter="!test"/>
+     </component>
+     <component name="title_pane_api" long-name="Title Pane API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/title_pane_api/group" filter="!test"/>
+     </component>
+     <component name="sounds_api" long-name="Sounds API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/sounds_api/group" filter="!test"/>
+     </component>
+     <component name="aiw_service_handler_api" long-name="AIW Service Handler API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/aiw_service_handler_api/group" filter="!test"/>
+     </component>
+     <component name="aiw_criteria_api" long-name="AIW Criteria API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/aiw_criteria_api/group" filter="!test"/>
+     </component>
+     <component name="touch_ui_utilities_api" long-name="Touch UI Utilities API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
+     </component>
+     <component name="generic_button_api" long-name="Generic Button API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/generic_button_api/group" filter="!test"/>
+     </component>
+     <component name="form_api" long-name="Form API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/form_api/group" filter="!test"/>
+     </component>
+     <component name="uikon_core_controls" long-name="Uikon Core Controls" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/uikon_core_controls/group" filter="!test"/>
+     </component>
+     <component name="calendar_api" long-name="Calendar API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/calendar_api/group"/>
+     </component>
+     <component name="toolbar_api" long-name="Toolbar API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/toolbar_api/group" filter="!test"/>
+     </component>
+     <component name="server_application_api" long-name="Server Application API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/server_application_api/group"/>
+     </component>
+     <component name="slider_api" long-name="Slider API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/slider_api/group" filter="!test"/>
+     </component>
+     <component name="private_ui_framework_api" long-name="Private UI Framework API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/private_ui_framework_api/group" filter="!test"/>
+     </component>
+     <component name="dialogs_api" long-name="Dialogs API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/dialogs_api/group" filter="!test"/>
+     </component>
+     <component name="document_handler_api" long-name="Document handler API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/document_handler_api/group"/>
+     </component>
+     <component name="images_api" long-name="Images API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/images_api/group" filter="!test"/>
+     </component>
+     <component name="stylus_popup_menu_api" long-name="Stylus Pop-up Menu API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
+     </component>
+     <component name="information_preview_popup_api" long-name="Information Preview Popup API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/information_preview_popup_api/group" filter="!test"/>
+     </component>
+     <component name="intermediate_state_api" long-name="Intermediate State API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/intermediate_state_api/group"/>
+     </component>
+     <component name="help_launcher_api" long-name="Help Launcher API" filter="s60" class="api">
+      <unit bldFile="mw/classicui/classicui_pub/help_launcher_api/group"/>
+     </component>
+    </collection>
     <collection name="ode" long-name="Open Dynamics Engine" level="support">
      <!-- the collection is really a component. Move down a directory.-->
      <component name="ode_build" filter="s60" long-name="ODE">
@@ -4431,12 +6860,6 @@
      </component>
     </collection>
     <collection name="classicui_info" long-name="Classic UI Info" level="specific">
-     <component name="classicui_pub" filter="s60" long-name="Classic UI Public Interfaces" class="api">
-      <unit bldFile="mw/classicui/classicui_pub/group"/>
-     </component>
-     <component name="classicui_plat" filter="s60" long-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 name="classicui_metadata" long-name="Classic UI Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
@@ -4444,9 +6867,12 @@
     </collection>
    </block>
    <block name="svgt" level="generic" long-name="SVG Tiny" levels="util ui">
-    <collection name="svgt_info" long-name="SVG Tiny Info" level="ui">
-     <component name="svgt_plat" filter="s60" long-name="SVG Tiny Platform Interfaces" introduced="9.2" class="api">
-      <unit bldFile="mw/svgt/svgt_plat/group"/>
+    <collection name="svgt_plat" long-name="SVG Tiny Platform Interfaces" level="ui">
+     <component name="svgt_api" long-name="SVGT API" introduced="9.2" filter="s60" class="api">
+      <unit bldFile="mw/svgt/svgt_plat/svgt_api/group"/>
+     </component>
+     <component name="nvg_api" long-name="NVG API" introduced="9.2" filter="s60" class="api">
+      <unit bldFile="mw/svgt/svgt_plat/nvg_api/group"/>
      </component>
     </collection>
     <collection name="svgtopt" long-name="SVG-T Engine" level="util">
@@ -4460,9 +6886,24 @@
     </collection>
    </block>
    <block name="uiaccelerator" level="generic" long-name="UI Accelerator" levels="plugin framework server ex if">
-    <collection name="uiaccelerator_info" long-name="UI Accelerator Info" level="if">
-     <component name="uiaccelerator_plat" filter="s60" long-name="UI Accelerator Platform Interfaces" class="api">
-      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/group"/>
+    <collection name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" level="if">
+     <component name="alf_core_toolkit_api" long-name="ALF Core Toolkit API" filter="s60" class="api">
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/group"/>
+     </component>
+     <component name="alf_visual_api" long-name="ALF Visual API" filter="s60" class="api">
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/group"/>
+     </component>
+     <component name="alf_extended_visual_api" long-name="ALF Extended Visual API" filter="s60" class="api">
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/group"/>
+     </component>
+     <component name="alf_extension_api" long-name="ALF Extension API" filter="s60" class="api">
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/group"/>
+     </component>
+     <component name="alf_tracing_api" long-name="ALF Tracing API" filter="s60" class="api">
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/group"/>
+     </component>
+     <component name="alf_client_server_api" long-name="ALF Client Server API" filter="s60" class="api">
+      <unit bldFile="mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/group"/>
      </component>
     </collection>
     <collection name="uiacceltk" long-name="UI Accelerator Toolkit" level="framework">
@@ -4476,21 +6917,79 @@
     </collection>
    </block>
    <block name="uiresources" level="generic" long-name="UI Resources" levels="compile plugin framework server generic data">
+    <!-- are the custom filters below needed? -->
+    <collection name="uiresources_pub" long-name="UI Resources Public Interfaces" level="data">
+     <component name="pictograph_api" long-name="Pictograph API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_pub/pictograph_api/group" filter="!test"/>
+     </component>
+     <component name="skins_api" long-name="Skins API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_pub/skins_api/group" filter="!test"/>
+     </component>
+     <component name="font_definition_api" long-name="Font Definition API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_pub/font_definition_api/group" filter="!test"/>
+     </component>
+     <component name="graphics_api" long-name="Graphics API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_pub/graphics_api/group" filter="!test"/>
+     </component>
+     <component name="scalable_icons_api" long-name="Scalable Icons API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_pub/scalable_icons_api/group"/>
+     </component>
+     <component name="layout_id_definitions_api" long-name="Layout ID Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_pub/layout_id_definitions_api/group"/>
+     </component>
+    </collection>
+    <collection name="uiresources_plat" long-name="UI Resources Platform Interfaces" level="data">
+     <component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/layout_system_private_api/group" filter="!test"/>
+     </component>
+     <component name="layout_data_api" long-name="Layout Data API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/layout_data_api/group" filter="!test"/>
+     </component>
+     <component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/cdl_api/group" filter="!test"/>
+     </component>
+     <component name="extended_skins_api" long-name="Extended Skins API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/extended_skins_api/group" filter="!test"/>
+     </component>
+     <component name="tfx_server_controller_plugin_api" long-name="TFX Server Controller Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_controller_plugin_api/group"/>
+     </component>
+     <component name="extended_fonts_api" long-name="Extended Fonts API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/extended_fonts_api/group" filter="!test"/>
+     </component>
+     <component name="graphic_configuration_api" long-name="Graphic Configuration API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/graphic_configuration_api/group" filter="!test"/>
+     </component>
+     <component name="mif_header_cdl_api" long-name="MIF Header CDL API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/mif_header_cdl_api/group"/>
+     </component>
+     <component name="personalisation_and_skins_settings_api" long-name="Personalisation and Skins Settings API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/personalisation_and_skins_settings_api/group"/>
+     </component>
+     <component name="tfx_effect_setup_plugin_api" long-name="TFX Effect Setup Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/tfx_effect_setup_plugin_api/group"/>
+     </component>
+     <component name="mifconv_definitions_api" long-name="Mifconv Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/mifconv_definitions_api/group"/>
+     </component>
+     <component name="wallpaper_configuration_api" long-name="Wallpaper Configuration API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/wallpaper_configuration_api/group"/>
+     </component>
+     <component name="language_code_definitions_api" long-name="Language Code Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/language_code_definitions_api/group"/>
+     </component>
+     <component name="skins_image_attributes_api" long-name="Skins Image Attributes API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/skins_image_attributes_api/group" filter="!test"/>
+     </component>
+     <component name="private_user_area_code_definitions_api" long-name="Private User Area Code Definitions API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/private_user_area_code_definitions_api/group"/>
+     </component>
+     <component name="tfx_server_plugin_ids_api" long-name="TFX Server Plug-in IDs API" filter="s60" class="api">
+      <unit bldFile="mw/uiresources/uiresources_plat/tfx_server_plugin_ids_api/group"/>
+     </component>
+    </collection>
     <collection name="uiresources_info" long-name="UI Resources Info" level="data">
-     <component name="uiresources_plat" filter="s60" long-name="UI Resources Platform Interfaces" class="api">
-      <unit bldFile="mw/uiresources/uiresources_plat/group"/>
-     </component>
-     <component name="uiresources_pub" filter="s60" long-name="UI Resources Public Interfaces" class="api">
-      <unit bldFile="mw/uiresources/uiresources_pub/group"/>
-     </component>
      <component name="uiresources_test" filter="s60,test,api_test" long-name="UI Resources Tests" purpose="development"/>
-     <!-- are these custom filters needed? -->
-     <component name="uiresources_test_pat" filter="s60,test,api_test" long-name="UI Resources Platform API Tests" purpose="development" class="placeholder">
-      <!-- can only have one unit. Need to #include from a common one -->
-     </component>
-     <component name="uiresources_test_pat" filter="s60,test,api_test" long-name="UI Resources Public API Tests" purpose="development" class="placeholder">
-      <!-- can only have one unit. Need to #include from a common one -->
-     </component>
     </collection>
     <collection name="uigraphics" long-name="UI Graphics" level="generic">
      <component name="bitmaps2" filter="s60" long-name="Bitmaps 2" class="config">
@@ -4563,6 +7062,22 @@
     </collection>
    </block>
    <block name="hapticsservices" level="generic" long-name="Haptics Services" levels="fw server api">
+    <collection name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" level="api">
+     <component name="tacticon_api" long-name="Tacticon API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/hapticsservices/hapticsservices_plat/tacticon_api/group"/>
+     </component>
+     <component name="tactile_feedback_core_api" long-name="Tactile Feedback Core API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_core_api/group"/>
+     </component>
+     <component name="tactile_feedback_server_api" long-name="Tactile Feedback Server API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/hapticsservices/hapticsservices_plat/tactile_feedback_server_api/group"/>
+     </component>
+    </collection>
+    <collection name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" level="api">
+     <component name="tactile_feedback_client_api" long-name="Tactile Feedback Client API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="mw/hapticsservices/hapticsservices_pub/tactile_feedback_client_api/group"/>
+     </component>
+    </collection>
     <collection name="tacticonserver" long-name="Tacticon Server" level="server">
      <!-- collection is really a component. Move down a directory  -->
      <component name="tacticonserver_build" filter="s60" long-name="Tacticon Server Build" introduced="^3">
@@ -4591,16 +7106,45 @@
       <unit bldFile="mw/hapticsservices/tactilefeedback/group"/>
      </component>
     </collection>
-    <collection name="hapticsservices_info" long-name="Haptics Services Info" level="api">
-     <component name="hapticsservices_pub" filter="s60" long-name="Haptics Services Public Interfaces" introduced="^1" class="api">
-      <unit bldFile="mw/hapticsservices/hapticsservices_pub/group"/>
-     </component>
-     <component name="hapticsservices_plat" filter="s60" long-name="Haptics Services Platform Interfaces" introduced="^1" class="api">
-      <unit bldFile="mw/hapticsservices/hapticsservices_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="gsprofilesrv" level="generic" long-name="General Settings and Profiles Services" levels="system plugin framework server generic specific">
+    <collection name="gsprofilesrv_pub" long-name="GS and Profiles Services Public Interfaces" level="specific">
+     <component name="profiles_engine_active_profile_settings_api" long-name="Profiles Engine Active Profile Settings API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_active_profile_settings_api/group"/>
+     </component>
+     <component name="profiles_engine_wrapper_api" long-name="Profiles Engine Wrapper API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/profiles_engine_wrapper_api/group"/>
+     </component>
+    </collection>
+    <collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
+     <component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
+     </component>
+     <component name="profiles_mediafilelist_api" long-name="Media File List API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/profiles_mediafilelist_api/group"/>
+     </component>
+     <component name="filelist_api" long-name="File List API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/filelist_api/group"/>
+     </component>
+     <component name="settings_backgroundimage_api" long-name="Settings Background Image API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_backgroundimage_api/group"/>
+     </component>
+     <component name="settings_framework_api" long-name="Settings Framework API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_framework_api/group"/>
+     </component>
+     <component name="settings_launch_api" long-name="Settings Launch API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_launch_api/group"/>
+     </component>
+     <component name="settings_listbox_api" long-name="Settings List Box API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_listbox_api/group"/>
+     </component>
+     <component name="settings_plugin_api" long-name="Settings Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_plugin_api/group"/>
+     </component>
+     <component name="settings_uis_cenrep_collection_api" long-name="Settings UIs CenRep Collection API" filter="s60" class="api">
+      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
+     </component>
+    </collection>
     <collection name="gssettingsuis" long-name="General Settings UIs" level="framework">
      <component name="gs" filter="s60" long-name="General Settings" introduced="9.2">
       <unit bldFile="mw/gsprofilesrv/gssettingsuis/gs/group"/>
@@ -4620,16 +7164,76 @@
       <unit bldFile="mw/gsprofilesrv/profilesservices/ringingtone3dplugin/group"/>
      </component>
     </collection>
-    <collection name="gsprofilesrv_info" long-name="GS and Profiles Services Info" level="specific">
-     <component name="gsprofilesrv_plat" filter="s60" long-name="GS and Profiles Services Platform Interfaces" class="api">
-      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_plat/group"/>
-     </component>
-     <component name="gsprofilesrv_pub" filter="s60" long-name="GS and Profiles Services Public Interfaces" class="api">
-      <unit bldFile="mw/gsprofilesrv/gsprofilesrv_pub/group"/>
-     </component>
-    </collection>
    </block>
    <block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
+    <collection name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" level="specific">
+     <component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_content_model_api/group"/>
+     </component>
+     <component name="ai_utilities_api" long-name="AI Utilities API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_utilities_api/group" filter="!test"/>
+     </component>
+     <component name="ai_plugin_management_api" long-name="AI Plug-in Management API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_management_api/group"/>
+     </component>
+     <component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_plugin_information_api/group"/>
+     </component>
+     <component name="ai_variation_api" long-name="AI Variation API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/ai_variation_api/group"/>
+     </component>
+     <component name="action_handler_plugin_api" long-name="Action Handler Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
+     </component>
+     <component name="content_harvester_plugin_api" long-name="Content Harvester Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
+     </component>
+     <component name="menu_model_api" long-name="Menu Model API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_model_api/group"/>
+     </component>
+     <component name="menu_sat_interface_api" long-name="Menu SAT Interface API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
+     </component>
+     <component name="external_home_screen_api" long-name="External Home Screen API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/external_home_screen_api/group"/>
+     </component>
+     <component name="menu_content_service_api" long-name="Menu Content Service API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/menu_content_service_api/group" filter="!test"/>
+     </component>
+     <component name="sapi_contentpublishing" long-name="SAPI Content Publishing" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_contentpublishing/group"/>
+     </component>
+     <component name="sapi_backstepping" long-name="SAPI Backstepping" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_backstepping/group"/>
+     </component>
+     <component name="sapi_actionhandler" long-name="SAPI Action Handler" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_actionhandler/group"/>
+     </component>
+     <component name="sapi_homescreenplugin" long-name="SAPI Homescreen Plugin" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_homescreenplugin/group" filter="!test"/>
+     </component>
+     <component name="sapi_menucontent" long-name="SAPI Menu Content" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/sapi_menucontent/group"/>
+     </component>
+     <component name="xcfw_api" long-name="XCFW API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/xcfw_api/group"/>
+     </component>
+     <component name="idlefw_api" long-name="Idle Framework API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/idlefw_api/group"/>
+     </component>
+     <component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
+     </component>
+     <component name="context_utility_api" long-name="UI Context Utility API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/context_utility_api/group"/>
+     </component>
+     <component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
+     </component>
+     <component name="hs_content_control_api" long-name="HS Content Control API" filter="s60" class="api">
+      <unit bldFile="mw/homescreensrv/homescreensrv_plat/hs_content_control_api/group"/>
+     </component>
+    </collection>
     <collection name="xcfw" long-name="XML Content Framework" level="framework">
      <!-- collection is really a component, needs to be moved down a directory -->
      <component name="xcfw_build" filter="s60" long-name="XML Content Framework Build">
@@ -4699,6 +7303,7 @@
     </collection>
     <collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
      <component name="contentpublishingdebug" filter="s60" long-name="Content Publishing Debug">
+      <!-- need to move this component outside of contentpublishingutils and into separate component directory -->
       <!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
      </component>
      <component name="contentpublishingutils" filter="s60" long-name="Content Publishing Utils">
@@ -4744,13 +7349,42 @@
       <unit bldFile="mw/homescreensrv/contentcontrolsrv/group"/>
      </component>
     </collection>
-    <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
-     <component name="homescreensrv_plat" filter="s60" long-name="Home Screen Services Platform Interfaces" class="api">
-      <unit bldFile="mw/homescreensrv/homescreensrv_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
+    <collection name="appinstall_plat" long-name="Application Installation Platform Interfaces" level="api">
+     <component name="iaupdate_api" long-name="IA Update API" filter="s60" class="api">
+      <unit bldFile="mw/appinstall/appinstall_plat/iaupdate_api/group"/>
+     </component>
+     <component name="task_plugin_api" long-name="Task Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/appinstall/appinstall_plat/task_plugin_api/group"/>
+     </component>
+     <component name="sw_installer_common_ui_api" long-name="SW Installer Common UI API" filter="s60" class="api">
+      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_common_ui_api/group"/>
+     </component>
+     <component name="sw_installer_launcher_api" long-name="SW Installer Launcher API" filter="s60" class="api">
+      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_launcher_api/group"/>
+     </component>
+     <component name="task_management_api" long-name="Task Management API" filter="s60" class="api">
+      <unit bldFile="mw/appinstall/appinstall_plat/task_management_api/group"/>
+     </component>
+     <component name="sw_installer_ui_plugin_api" long-name="SW Installer UI Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ui_plugin_api/group"/>
+     </component>
+     <component name="sw_installer_cr_keys" long-name="SW Installer CR Keys" filter="s60" class="api">
+      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_cr_keys/group"/>
+     </component>
+     <component name="sw_installer_ps_keys" long-name="SW Installer PS Keys" filter="s60" class="api">
+      <unit bldFile="mw/appinstall/appinstall_plat/sw_installer_ps_keys/group"/>
+     </component>
+     <component name="appmngr2runtimeapi" long-name="Application Manager 2 Runtime Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/appinstall/appinstall_plat/appmngr2runtimeapi/group"/>
+     </component>
+    </collection>
+    <collection name="appinstall_pub" long-name="Application Installation Public Interfaces" level="api">
+     <component name="startup_list_management_api" long-name="Startup List Management API" filter="s60" class="api">
+      <unit bldFile="mw/appinstall/appinstall_pub/startup_list_management_api/group"/>
+     </component>
+    </collection>
     <collection name="ncdengine" long-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 name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
@@ -4815,18 +7449,42 @@
      </component>
     </collection>
     <collection name="appinstall_info" long-name="Application Installation Info" level="api">
-     <component name="appinstall_pub" filter="s60" long-name="Application Installation Public Interfaces" class="api">
-      <unit bldFile="mw/appinstall/appinstall_pub/group"/>
-     </component>
-     <component name="appinstall_plat" filter="s60" long-name="Application Installation Platform Interfaces" class="api">
-      <unit bldFile="mw/appinstall/appinstall_plat/group"/>
-     </component>
      <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="serviceapifw" level="specific" long-name="Service API Framework" levels="plugin framework server generic specific">
+    <collection name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" level="specific"/>
+    <collection name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" level="specific">
+     <component name="rtsecuritymanager_common_api" long-name="Runtime Security Manager Common API" filter="s60" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/group"/>
+     </component>
+     <component name="rtsecuritymanager_utility_api" long-name="Runtime Security Manager Utility API" filter="s60" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/group"/>
+     </component>
+     <component name="rtsecuritymanager_client_api" long-name="Runtime Security Manager Client API" filter="s60" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/group"/>
+     </component>
+     <component name="liw_provider_utility_api" long-name="LIW Provider Utility API" filter="s60" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_provider_utility_api/group"/>
+     </component>
+     <component name="liw_service_interface_base_api" long-name="LIW Service Interface Base API" filter="s60" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_base_api/group"/>
+     </component>
+     <component name="liw_service_interface_menu_api" long-name="LIW Service Interface Menu API" filter="s60" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_interface_menu_api/group"/>
+     </component>
+     <component name="liw_criteria_api" long-name="LIW Criteria API" filter="s60" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_criteria_api/group"/>
+     </component>
+     <component name="liw_generic_parameter_api" long-name="LIW Generic Parameter API" filter="s60" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_generic_parameter_api/group"/>
+     </component>
+     <component name="liw_service_handler_api" long-name="LIW Service Handler API" filter="s60" class="api">
+      <unit bldFile="mw/serviceapifw/serviceapifw_plat/liw_service_handler_api/group"/>
+     </component>
+    </collection>
     <collection name="rtsecuritymanager" long-name="Runtime Security Manager" level="server">
      <component name="rtsecuritymanagerutil" filter="s60" long-name="Runtime Security Manager Util">
       <unit bldFile="mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
@@ -4847,14 +7505,6 @@
       <unit bldFile="mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
      </component>
     </collection>
-    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
-     <component name="serviceapifw_plat" filter="s60" long-name="Service API Framework Platform Interfaces" class="api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_plat/group"/>
-     </component>
-     <component name="serviceapifw_pub" filter="s60" long-name="Service API Framework Public Interfaces" class="api">
-      <unit bldFile="mw/serviceapifw/serviceapifw_pub/group"/>
-     </component>
-    </collection>
    </block>
    <block name="serviceapi" level="specific" long-name="Service API" levels="os mw1 mw2 app">
     <!-- should break up this collection into something meaningful -->
@@ -4902,13 +7552,83 @@
     </collection>
    </block>
    <block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
+    <collection name="web_pub" long-name="Web Public Interfaces" level="specific">
+     <component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_pub/browser_control_api/group"/>
+     </component>
+     <component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_pub/download_mgr_client_api/group"/>
+     </component>
+     <component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_pub/download_mgr_ui_api/group"/>
+     </component>
+     <component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_pub/favourites_engine_api/group"/>
+     </component>
+     <component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_pub/browser_plugin_api/group"/>
+     </component>
+     <component name="settings_api" long-name="Settings API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_pub/settings_api/group"/>
+     </component>
+    </collection>
+    <collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
+     <component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/browser_platform_api/inc/browser_platform_variant.hrh"/>
+     </component>
+     <component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
+     </component>
+     <component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/browser_dialogs_provider_api/group"/>
+     </component>
+     <component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/browser_platform_api/group"/>
+     </component>
+     <component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/cod_handler_api/group"/>
+     </component>
+     <component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/connection_manager_api/group"/>
+     </component>
+     <component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/cxml_library_api/group"/>
+     </component>
+     <component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/download_mgr_client_api_extn/group"/>
+     </component>
+     <component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/feeds_engine_api/group"/>
+     </component>
+     <component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/launcher_api/group"/>
+     </component>
+     <component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/multipart_parser_api/group"/>
+     </component>
+     <component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/recent_url_store_api/group"/>
+     </component>
+     <component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/scheme_handler_plugin_api/group"/>
+     </component>
+     <component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/scriptable_plugin_api/group"/>
+     </component>
+     <component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/webutils_api/group"/>
+     </component>
+     <component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/widget_registry_api/group"/>
+     </component>
+     <component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/xml_parser_api/group"/>
+     </component>
+     <component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
+      <unit bldFile="mw/web/web_plat/stmgesturefw_api/group"/>
+     </component>
+    </collection>
     <collection name="web_info" long-name="Web Info" level="specific">
-     <component name="web_plat" filter="s60" long-name="Web Platform Interfaces" class="api">
-      <unit bldFile="mw/web/web_plat/group"/>
-     </component>
-     <component name="web_pub" filter="s60" long-name="Web Public Interfaces" class="api">
-      <unit bldFile="mw/web/web_pub/group"/>
-     </component>
      <component name="web_build" filter="s60" long-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"/>
@@ -5069,6 +7789,29 @@
     </collection>
    </block>
    <block name="websrv" level="generic" long-name="Web Services" levels="plugin framework server generic specific">
+    <collection name="websrv_pub" long-name="Web Services Public Interfaces" level="specific">
+     <component name="web_service_description_api" long-name="Web Service Description API" filter="s60" class="api">
+      <unit bldFile="mw/websrv/websrv_pub/web_service_description_api/group"/>
+     </component>
+     <component name="web_service_connection_api" long-name="Web Service Connection API" filter="s60" class="api">
+      <unit bldFile="mw/websrv/websrv_pub/web_service_connection_api/group"/>
+     </component>
+     <component name="web_service_manager_api" long-name="Web Service Manager API" filter="s60" class="api">
+      <unit bldFile="mw/websrv/websrv_pub/web_service_manager_api/group"/>
+     </component>
+     <component name="hostlet_connection_api" long-name="Hostlet Connection API" filter="s60" class="api">
+      <unit bldFile="mw/websrv/websrv_pub/hostlet_connection_api/group"/>
+     </component>
+     <component name="web_service_messaging_api" long-name="Web Service Messaging API" filter="s60" class="api">
+      <unit bldFile="mw/websrv/websrv_pub/web_service_messaging_api/group"/>
+     </component>
+     <component name="xml_extensions_api" long-name="XML Extensions API" filter="s60" class="api">
+      <unit bldFile="mw/websrv/websrv_pub/xml_extensions_api/group"/>
+     </component>
+     <component name="xml_fragment_api" long-name="XML Fragment API" filter="s60" class="api">
+      <unit bldFile="mw/websrv/websrv_pub/xml_fragment_api/group"/>
+     </component>
+    </collection>
     <collection name="webservices" long-name="Web Services Framework" level="generic">
      <!-- consider breaking this collection into more meaningful subsets -->
      <component name="wsnotifierplugins" filter="s60" long-name="WS Notifier Plugins" plugin="Y">
@@ -5165,9 +7908,6 @@
       <!-- need to include common .hrh in each unit -->
       <unit bldFile="mw/websrv/group"/>
      </component>
-     <component name="websrv_pub" filter="s60" long-name="Web Services Public Interfaces" class="api">
-      <unit bldFile="mw/websrv/websrv_pub/group"/>
-     </component>
     </collection>
    </block>
    <block name="platformtools" level="generic" long-name="Platform Tools">
@@ -5181,6 +7921,19 @@
     </collection>
    </block>
    <block name="uitools" level="specific" long-name="UI Tools" levels="compile encode tool if">
+    <collection name="uitools_pub" long-name="UI Tools Public Interfaces" level="if">
+     <component name="third_party_bitmap_palette_api" long-name="Third Party Bitmap Palette API" filter="s60" class="api">
+      <unit bldFile="mw/uitools/uitools_pub/third_party_bitmap_palette_api/group"/>
+     </component>
+    </collection>
+    <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
+     <component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+      <unit bldFile="mw/uitools/uitools_plat/cdl_api/group"/>
+     </component>
+     <component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+      <unit bldFile="mw/uitools/uitools_plat/layout_system_private_api/group"/>
+     </component>
+    </collection>
     <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
      <!-- collection is actually a component. Needs to be moved down a directory -->
      <component name="cdlcompilertoolkit_build" filter="s60" long-name="CDL Compiler Toolkit Build">
@@ -5224,18 +7977,23 @@
       <unit bldFile="mw/uitools/svgtencoder/svgtenc/standalone/group"/>
      </component>
     </collection>
-    <collection name="uitools_info" long-name="UI Tools Info" level="if">
-     <component name="uitools_plat" filter="s60" long-name="UI Tools Platform Interfaces" class="api">
-      <unit bldFile="mw/uitools/uitools_plat/group"/>
-     </component>
-     <component name="uitools_pub" filter="s60" long-name="UI Tools Public Interfaces" class="api">
-      <unit bldFile="mw/uitools/uitools_pub/group"/>
-     </component>
-    </collection>
    </block>
   </layer>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
+    <collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="apps">
+     <component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
+      <unit bldFile="app/location/loc_plat/location_centre_api/group"/>
+     </component>
+    </collection>
+    <collection name="loc_pub" long-name="Location Apps Public Interfaces" level="apps">
+     <component name="landmarks_ui_selector_api" long-name="Landmarks UI Selector API" filter="s60" class="api">
+      <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/group"/>
+     </component>
+     <component name="landmarks_ui_addedit_api" long-name="Landmarks UI Add/Edit API" filter="s60" class="api">
+      <unit bldFile="app/location/loc_pub/landmarks_ui_addedit_api/group"/>
+     </component>
+    </collection>
     <collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
      <component name="blid" filter="s60" long-name="Basic Location Info Display Build">
       <unit bldFile="app/location/basiclocationinfodisplay/blid/group"/>
@@ -5337,16 +8095,19 @@
       <unit bldFile="app/location/locationcentre/group"/>
      </component>
     </collection>
-    <collection name="location_info" long-name="Location Apps Info" level="loc">
-     <component name="loc_pub" filter="s60" long-name="Location Apps Public Interfaces" class="api">
-      <unit bldFile="app/location/loc_pub/group"/>
-     </component>
-     <component name="loc_plat" filter="s60" long-name="Location Apps Platform Interfaces" introduced="^3" class="api">
-      <unit bldFile="app/location/loc_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
+    <collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
+     <component name="multimedia_sharing_settings_api" long-name="Multimedia Sharing Settings API" filter="s60" class="api">
+      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_settings_api/group"/>
+     </component>
+     <component name="multimedia_sharing_resource_api" long-name="Multimedia Sharing Resource API" filter="s60" class="api">
+      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_resource_api/group"/>
+     </component>
+     <component name="multimedia_sharing_manager_api" long-name="Multimedia Sharing Manager API" filter="s60" class="api">
+      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/group"/>
+     </component>
+    </collection>
     <collection name="mmsharing" long-name="Multimedia Sharing" level="base">
      <component name="mmshavailability" filter="s60" long-name="Multimedia Sharing Availability">
       <unit bldFile="app/mmsharinguis/mmsharing/mmshavailability/group"/>
@@ -5356,7 +8117,7 @@
      </component>
      <!-- consider putting client and server in the same component -->
      <component name="mmshmanagercli" filter="s60" long-name="Multimedia Sharing Manager Client">
-      <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
+      <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagercli/group" filter="!test"/>
      </component>
      <component name="mmshmanagersrv" filter="s60" long-name="Multimedia Sharing Manager Server">
       <unit bldFile="app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
@@ -5365,7 +8126,7 @@
       <unit bldFile="app/mmsharinguis/mmsharing/mmshengine/group"/>
      </component>
      <component name="mmshui" filter="s60" long-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>
@@ -5395,18 +8156,68 @@
       <!--  consider distributing to other components -->
       <unit bldFile="app/mmsharinguis/group"/>
      </component>
-     <component name="mmsharinguis_plat" filter="s60" long-name="Multimedia Sharing UIs Platform Interfaces" class="api">
-      <unit bldFile="app/mmsharinguis/mmsharinguis_plat/group"/>
-     </component>
     </collection>
    </block>
    <block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
+    <collection name="phone_plat" long-name="Phone Apps Platform Interfaces" level="app">
+     <component name="3d_ringing_tone_enabler_api" long-name="3D Ringing Tone Enabler API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/3d_ringing_tone_enabler_api/group"/>
+     </component>
+     <component name="telephony_comms_information_api" long-name="Telephony Comms Information API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_comms_information_api/group"/>
+     </component>
+     <component name="telephony_information_api" long-name="Telephony Information API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_information_api/group"/>
+     </component>
+     <component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_device_mode_api/group"/>
+     </component>
+     <component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_remote_party_information_api/group"/>
+     </component>
+     <component name="telephony_video_mailbox_settings_api" long-name="Telephony Video Mailbox Settings API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_video_mailbox_settings_api/group"/>
+     </component>
+     <component name="telephony_configuration_api" long-name="Telephony Configuration API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_configuration_api/group"/>
+     </component>
+     <component name="telephony_microphone_mute_status_api" long-name="Telephony Microphone Mute Status API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_microphone_mute_status_api/group"/>
+     </component>
+     <component name="dialer_keypad_api" long-name="Dialer Keypad API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/dialer_keypad_api/group"/>
+     </component>
+     <component name="telephony_logging_extension_api" long-name="Telephony Logging Extension API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_logging_extension_api/group"/>
+     </component>
+     <component name="telephony_matching_extension_api" long-name="Telephony Matching Extension API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_matching_extension_api/group"/>
+     </component>
+     <component name="telephony_bubble_extension_api" long-name="Telephony Bubble Extension API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_bubble_extension_api/group"/>
+     </component>
+     <component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_menu_extension_api/group"/>
+     </component>
+     <component name="phone_application_commands_api" long-name="Phone Application Commands API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/phone_application_commands_api/group"/>
+     </component>
+     <component name="phone_application_voip_commands_api" long-name="Phone Application VOIP Commands API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/phone_application_voip_commands_api/group"/>
+     </component>
+     <component name="telephony_mediator_api" long-name="Telephony Mediator API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/telephony_mediator_api/group"/>
+     </component>
+     <component name="video_telephony_mediator_api" long-name="Video Telephony Mediator API" filter="s60" class="api">
+      <unit bldFile="app/phone/phone_plat/video_telephony_mediator_api/group"/>
+     </component>
+    </collection>
     <collection name="phoneapp" long-name="Phone Application" level="app">
      <component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
       <unit bldFile="app/phone/phoneapp/blacklist/group"/>
      </component>
      <component name="phoneui" filter="s60" long-name="Phone UI">
-      <unit bldFile="app/phone/phoneapp/phoneui/group"/>
+      <unit bldFile="app/phone/phoneapp/phoneui/group" filter="!test"/>
      </component>
      <component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
       <unit bldFile="app/phone/phoneapp/phoneuicontrol/group"/>
@@ -5466,7 +8277,7 @@
     </collection>
     <collection name="phoneuis" long-name="Phone UIs" level="ui">
      <component name="dialer" filter="s60" long-name="Dialer">
-      <unit bldFile="app/phone/phoneuis/dialer/group"/>
+      <unit bldFile="app/phone/phoneuis/dialer/group" filter="!test"/>
      </component>
      <component name="easydialing" filter="s60" long-name="Easy Dialing Plugin" introduced="^3" plugin="Y">
       <unit bldFile="app/phone/phoneuis/easydialing/group"/>
@@ -5487,11 +8298,6 @@
       <unit bldFile="app/phone/phoneuis/telephonydevicemode/group"/>
      </component>
     </collection>
-    <collection name="phone_info" long-name="Phone Apps Info" level="app">
-     <component name="phone_plat" filter="s60" long-name="Phone Apps Platform Interfaces" class="api">
-      <unit bldFile="app/phone/phone_plat/group"/>
-     </component>
-    </collection>
     <collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
      <component name="telbranding" filter="s60" long-name="Tel Branding" introduced="^2" plugin="Y">
       <unit bldFile="app/phone/phoneplugins/telbranding/group"/>
@@ -5499,6 +8305,14 @@
     </collection>
    </block>
    <block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
+    <collection name="videotelephony_plat" long-name="VT Apps Platform Interfaces" level="ui">
+     <component name="video_telephony_control_mediator_api" long-name="Video Telephony Control Mediator API" filter="s60" class="api">
+      <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_control_mediator_api/group"/>
+     </component>
+     <component name="video_telephony_media_configuration_api" long-name="Video Telephony Media Configuration API" filter="s60" class="api">
+      <unit bldFile="app/videotelephony/videotelephony_plat/video_telephony_media_configuration_api/group"/>
+     </component>
+    </collection>
     <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
      <component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
       <unit bldFile="app/videotelephony/vtengines/videoteleng/Group"/>
@@ -5526,13 +8340,28 @@
       <unit bldFile="app/videotelephony/vtprotocolsstub/group" filter="sf_build"/>
      </component>
     </collection>
-    <collection name="videotelephony_info" long-name="VT Apps Info" level="ui">
-     <component name="videotelephony_plat" filter="s60" long-name="VT Apps Platform Interfaces" class="api">
-      <unit bldFile="app/videotelephony/videotelephony_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="iptelephony" level="apps" long-name="IP Telephony" levels="eng plugin util ui">
+    <collection name="iptel_plat" long-name="IP Telephony Platform Interfaces" level="ui">
+     <component name="richcallsettingsengine_api" long-name="Rich Call Settings Engine API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/iptelephony/iptel_plat/richcallsettingsengine_api/group"/>
+     </component>
+     <component name="cch_client_api" long-name="CCH Client API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/iptelephony/iptel_plat/cch_client_api/group"/>
+     </component>
+     <component name="cch_server_api" long-name="CCH Server API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/iptelephony/iptel_plat/cch_server_api/group"/>
+     </component>
+     <component name="csc_settingsui_api" long-name="CSC Settings UI API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/iptelephony/iptel_plat/csc_settingsui_api/group"/>
+     </component>
+     <component name="vccpropertyhandler_api" long-name="VCC Property Handler API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/iptelephony/iptel_plat/vccpropertyhandler_api/group"/>
+     </component>
+     <component name="vcc_api" long-name="VCC API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/iptelephony/iptel_plat/vcc_api/group"/>
+     </component>
+    </collection>
     <collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
      <component name="cscgsplugin" filter="s60" long-name="CSC GS Plugin" introduced="^2" plugin="Y">
       <unit bldFile="app/iptelephony/commsconfig/cscgsplugin/group"/>
@@ -5639,13 +8468,16 @@
       <unit bldFile="app/iptelephony/callcontinuity/group"/>
      </component>
     </collection>
-    <collection name="iptelephony_info" long-name="IP Telephony Info" level="ui">
-     <component name="iptel_plat" filter="s60" long-name="IP Telephony Platform Interfaces" introduced="^2" class="api">
-      <unit bldFile="app/iptelephony/iptel_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="settingsuis" level="services" long-name="Settings UIs" levels="rsc ui">
+    <collection name="devmngt_plat" long-name="Settings UIs Platform Interfaces" level="ui">
+     <component name="default_app_client_api" long-name="Default App Client API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="app/settingsuis/devmngt_plat/default_app_client_api/group"/>
+     </component>
+     <component name="services_db_api" long-name="Services DB API" introduced="^1" filter="s60" class="api">
+      <unit bldFile="app/settingsuis/devmngt_plat/services_db_api/group" filter="!test"/>
+     </component>
+    </collection>
     <collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
      <component name="services_db" filter="s60" long-name="Services Database" introduced="^1">
       <unit bldFile="app/settingsuis/defaultapplicationsettings/services_db/group"/>
@@ -5669,16 +8501,25 @@
       <unit bldFile="app/settingsuis/systemswuis/touchscreencalib/group"/>
      </component>
     </collection>
-    <collection name="settingsuis_info" long-name="Settings UIs Info" level="ui">
-     <component name="devmngt_plat" filter="s60" long-name="Settings UIs Platform Interfaces" introduced="^1" class="api">
-      <unit bldFile="app/settingsuis/devmngt_plat/group"/>
-     </component>
-     <component name="devmngt_pub" filter="s60" long-name="Settings UIs Public Interfaces" introduced="^1" class="api">
-      <unit bldFile="app/settingsuis/devmngt_pub/group"/>
-     </component>
-    </collection>
    </block>
    <block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
+    <collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
+     <component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
+      <unit bldFile="app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
+     </component>
+     <component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
+      <unit bldFile="app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
+     </component>
+     <component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
+      <unit bldFile="app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
+     </component>
+     <component name="adapter_customization_api" long-name="Adapter Customization API" filter="s60" class="api">
+      <unit bldFile="app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
+     </component>
+     <component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" class="api">
+      <unit bldFile="app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+     </component>
+    </collection>
     <collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
      <!-- Component at wrong rank, should move down a directory -->
      <component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
@@ -5693,11 +8534,6 @@
       <unit bldFile="app/contentcontrol/omads/omadsextensions/group"/>
      </component>
     </collection>
-    <collection name="contentcontrol_info" long-name="Content Control Daemons Info" level="app">
-     <component name="contentctrl_plat" filter="s60" long-name="Content Control Daemons Platforn Interfaces" class="api">
-      <unit bldFile="app/contentcontrol/contentctrl_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="devicecontrol" level="services" long-name="Device Control Daemons" levels="oma mid app">
     <collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
@@ -5817,6 +8653,11 @@
     </collection>
    </block>
    <block name="files" level="apps" long-name="File Manager Apps" levels="support apps">
+    <collection name="files_plat" long-name="File Manager Apps Platform Interfaces" level="apps">
+     <component name="memory_scan_popup_ui_api" long-name="Memory Scan Popup UI API" filter="s60" class="api">
+      <unit bldFile="app/files/files_plat/memory_scan_popup_ui_api/group"/>
+     </component>
+    </collection>
     <collection name="deviceencryption" long-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 name="devencnotifplugin" filter="s60" long-name="Device Encryption Notifier Plugin" introduced="^3" plugin="Y">
@@ -5852,11 +8693,6 @@
       <unit bldFile="app/files/filesystemuis/memstatepopup/group"/>
      </component>
     </collection>
-    <collection name="files_info" long-name="File Manager Apps Info" level="apps">
-     <component name="files_plat" filter="s60" long-name="File Manager Apps Platform Interfaces" class="api">
-      <unit bldFile="app/files/files_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="utils" level="apps" long-name="Utility Apps" levels="app">
     <collection name="extras" long-name="Extras" level="app">
@@ -5872,6 +8708,175 @@
     </collection>
    </block>
    <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
+    <collection name="contacts_pub" long-name="Contacts Apps Public Interfaces" level="ui">
+     <component name="phonebook_fetch_ui_api" long-name="Phonebook Fetch UI API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_pub/phonebook_fetch_ui_api/group"/>
+     </component>
+     <component name="phonebook_data_management_api" long-name="Phonebook Data Management API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_pub/phonebook_data_management_api/group"/>
+     </component>
+     <component name="phonebook_vcard_importexport_api" long-name="Phonebook vCard Import/Export API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_pub/phonebook_vcard_importexport_api/group"/>
+     </component>
+     <component name="phonebook_data_addedit_ui_api" long-name="Phonebook Data Add/Edit UI API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_pub/phonebook_data_addedit_ui_api/group"/>
+     </component>
+     <component name="phonebook_ui_utilities_api" long-name="Phonebook UI Utilities API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_pub/phonebook_ui_utilities_api/group"/>
+     </component>
+     <component name="phonebook_thumbnail_operation_api" long-name="Phonebook Thumbnail Operation API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_pub/phonebook_thumbnail_operation_api/group"/>
+     </component>
+     <component name="speed_dial_utility_control_api" long-name="Speed Dial Utility Control API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_pub/speed_dial_utility_control_api/group"/>
+     </component>
+    </collection>
+    <collection name="contacts_plat" long-name="Contacts Apps Platform Interfaces" level="ui">
+     <component name="virtual_phonebook_store_api" long-name="Virtual Phonebook Store API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_store_api/group"/>
+     </component>
+     <component name="virtual_phonebook_sim_services_api" long-name="Virtual Phonebook SIM Services API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_sim_services_api/group"/>
+     </component>
+     <component name="virtual_phonebook_configuration_api" long-name="Virtual Phonebook Configuration API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_configuration_api/group"/>
+     </component>
+     <component name="virtual_phonebook_copy_policy_api" long-name="Virtual Phonebook Copy Policy API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_copy_policy_api/group"/>
+     </component>
+     <component name="virtual_phonebook_policy_api" long-name="Virtual Phonebook Policy API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_policy_api/group"/>
+     </component>
+     <component name="virtual_phonebook_engine_api" long-name="Virtual Phonebook Engine API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_engine_api/group"/>
+     </component>
+     <component name="virtual_phonebook_migration_support_api" long-name="Virtual Phonebook Migration Support API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_migration_support_api/group"/>
+     </component>
+     <component name="virtual_phonebook_view_definition_api" long-name="Virtual Phonebook View Definition API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_view_definition_api/group"/>
+     </component>
+     <component name="virtual_phonebook_vcard_api" long-name="Virtual Phonebook vCard API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/virtual_phonebook_vcard_api/group"/>
+     </component>
+     <component name="cms_contactor_api" long-name="CMS Contactor API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/cms_contactor_api/group"/>
+     </component>
+     <component name="contactpresence_api" long-name="Contact Presence API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/contactpresence_api/group"/>
+     </component>
+     <component name="presence_cache_api" long-name="Presence Cache API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/presence_cache_api/group"/>
+     </component>
+     <component name="phonebook_internal_common_api" long-name="Phonebook Internal Common API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_common_api/group"/>
+     </component>
+     <component name="phonebook_internal_appfw_api" long-name="Phonebook Internal App Framework API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_appfw_api/group"/>
+     </component>
+     <component name="phonebook_internal_data_management_api" long-name="Phonebook Internal Data Management API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_data_management_api/group"/>
+     </component>
+     <component name="phonebook_2_xsp_extension_manager_api" long-name="Phonebook 2 xSP Extension Manager API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_extension_manager_api/group"/>
+     </component>
+     <component name="phonebook_ui_controls_api" long-name="Phonebook UI Controls API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_ui_controls_api/group"/>
+     </component>
+     <component name="phonebook_2_image_management_api" long-name="Phonebook 2 Image Management API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_image_management_api/group"/>
+     </component>
+     <component name="phonebook_extension_api" long-name="Phonebook Extension API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_extension_api/group"/>
+     </component>
+     <component name="phonebook_public_constants_api" long-name="Phonebook Public Constants API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_public_constants_api/group"/>
+     </component>
+     <component name="phonebook_internal_ui_utilities_api" long-name="Phonebook Internal UI Utilities API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_internal_ui_utilities_api/group"/>
+     </component>
+     <component name="logs_engine_api_extensions" long-name="Logs Engine API Extensions" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/logs_engine_api_extensions/group"/>
+     </component>
+     <component name="phonebook_thumbnails_api" long-name="Phonebook Thumbnails API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_thumbnails_api/group"/>
+     </component>
+     <component name="phonebook_2_icon_api" long-name="Phonebook 2 Icon API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_icon_api/group"/>
+     </component>
+     <component name="phonebook_engine_extension_api" long-name="Phonebook Engine Extension API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_engine_extension_api/group"/>
+     </component>
+     <component name="phonebook_2_store_configuration_management_api" long-name="Phonebook 2 Store Configuration Management API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_configuration_management_api/group"/>
+     </component>
+     <component name="logs_ui_command_line_api" long-name="Logs UI Command Line API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/logs_ui_command_line_api/group"/>
+     </component>
+     <component name="speed_dial_dialogs_api" long-name="Speed Dial Dialogs API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/speed_dial_dialogs_api/group"/>
+     </component>
+     <component name="phonebook_2_xsp_view_activation_api" long-name="Phonebook 2 xSP View Activation API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_xsp_view_activation_api/group"/>
+     </component>
+     <component name="logs_timers_api" long-name="Logs Timers API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/logs_timers_api/group"/>
+     </component>
+     <component name="phonebook_2_ui_extension_definition_api" long-name="Phonebook 2 UI Extension Definition API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_definition_api/group"/>
+     </component>
+     <component name="phonebook_2_common_ui_api" long-name="Phonebook 2 Common UI API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_common_ui_api/group"/>
+     </component>
+     <component name="phonebook_2_ui_extension_api" long-name="Phonebook 2 UI Extension API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_api/group"/>
+     </component>
+     <component name="phonebook_2_store_property_api" long-name="Phonebook 2 Store Property API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_store_property_api/group"/>
+     </component>
+     <component name="phonebook_2_ui_extension_plugin_api" long-name="Phonebook 2 UI Extension Plug-In API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_extension_plugin_api/group"/>
+     </component>
+     <component name="phonebook_2_ui_controls_api" long-name="Phonebook 2 UI Controls API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_controls_api/group"/>
+     </component>
+     <component name="phonebook_2_thin_ui_extension_plugin_api" long-name="Phonebook 2 Thin UI Extension Plugin API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_thin_ui_extension_plugin_api/group"/>
+     </component>
+     <component name="phonebook_2_commands_api" long-name="Phonebook 2 Commands API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_commands_api/group"/>
+     </component>
+     <component name="phonebook_2_presentation_api" long-name="Phonebook 2 Presentation API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_presentation_api/group"/>
+     </component>
+     <component name="phonebook_2_ui_utilities_api" long-name="Phonebook 2 UI Utilities API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_ui_utilities_api/group"/>
+     </component>
+     <component name="phonebook_2_contact_related_icon_customization_api" long-name="Phonebook 2 Contact Related Icon Customization API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_contact_related_icon_customization_api/group"/>
+     </component>
+     <component name="cca_launch_api" long-name="CCA Launch API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/cca_launch_api/group"/>
+     </component>
+     <component name="cca_view_plugin_api" long-name="CCA View Plugin API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/cca_view_plugin_api/group"/>
+     </component>
+     <component name="predictivesearch_client_api" long-name="Predictive Search Client API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/predictivesearch_client_api/group"/>
+     </component>
+     <component name="predictivesearch_utils_api" long-name="Predictive Search Utils API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/predictivesearch_utils_api/group"/>
+     </component>
+     <component name="predictivesearch_adapters_api" long-name="Predictive Search Adapters API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/predictivesearch_adapters_api/group"/>
+     </component>
+     <component name="predictivesearch_algorithm_api" long-name="Predictive Search Algorithm API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/predictivesearch_algorithm_api/group"/>
+     </component>
+     <component name="phonebook_2_rcl_api" long-name="Phonebook 2 RCL API" filter="s60" class="api">
+      <unit bldFile="app/contacts/contacts_plat/phonebook_2_rcl_api/group"/>
+     </component>
+    </collection>
     <collection name="contactextensions" long-name="Contacts Extensions" level="services">
      <component name="predefinedcontacts" filter="s60" long-name="Predefined Contacts">
       <unit bldFile="app/contacts/contactextensions/predefinedcontacts/group"/>
@@ -5958,18 +8963,82 @@
      </component>
     </collection>
     <collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-     <component name="contacts_plat" filter="s60" long-name="Contacts Apps Platform Interfaces" class="api">
-      <unit bldFile="app/contacts/contacts_plat/group"/>
-     </component>
-     <component name="contacts_pub" filter="s60" long-name="Contacts Apps Public Interfaces" class="api">
-      <unit bldFile="app/contacts/contacts_pub/group"/>
-     </component>
      <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui app">
+    <collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
+     <component name="meeting_request_mailbox_utilities_api" long-name="Meeting Request Mailbox Utilities API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/group"/>
+     </component>
+     <component name="meeting_request_uids_api" long-name="Meeting Request UIDs API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/meeting_request_uids_api/group"/>
+     </component>
+     <component name="calendar_exporter_api" long-name="Calendar Exporter API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/calendar_exporter_api/group"/>
+     </component>
+     <component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/agenda_versit_2_api/group"/>
+     </component>
+     <component name="calendar_importer_api" long-name="Calendar Importer API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/calendar_importer_api/group"/>
+     </component>
+     <component name="calendar_launcher_api" long-name="Calendar Launcher API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/calendar_launcher_api/group"/>
+     </component>
+     <component name="calendar_common_utils_api" long-name="Calendar Common Utils API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/calendar_common_utils_api/group"/>
+     </component>
+     <component name="searchfw_launcher_api" long-name="Search Framework Launcher API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/searchfw_launcher_api/group"/>
+     </component>
+     <component name="alarm_const_api" long-name="Alarm Const API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/alarm_const_api/group"/>
+     </component>
+     <component name="alarm_ui_external_control_api" long-name="Alarm UI External Control API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/alarm_ui_external_control_api/group"/>
+     </component>
+     <component name="calendar_settings_keys_api" long-name="Calendar Settings Keys API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/calendar_settings_keys_api/group"/>
+     </component>
+     <component name="calendar_tones_settings_keys_api" long-name="Calendar Tones Settings Keys API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/calendar_tones_settings_keys_api/group"/>
+     </component>
+     <component name="clock_settings_api" long-name="Clock Settings API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/clock_settings_api/group"/>
+     </component>
+     <component name="common_alarm_editor_api" long-name="Common Alarm Editor API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/common_alarm_editor_api/group"/>
+     </component>
+     <component name="alarm_ui_secondary_display_api" long-name="Alarm UI Secondary Display API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/alarm_ui_secondary_display_api/group"/>
+     </component>
+     <component name="searchui_launcher_api" long-name="Search UI Launcher API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/searchui_launcher_api/group"/>
+     </component>
+     <component name="agenda_entry_ui_api" long-name="Agenda Entry UI API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/agenda_entry_ui_api/group"/>
+     </component>
+     <component name="meeting_request_utillities_api" long-name="Meeting Request Utillities API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/meeting_request_utillities_api/group"/>
+     </component>
+     <component name="meeting_request_viewer_api" long-name="Meeting Request Viewer API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/meeting_request_viewer_api/group"/>
+     </component>
+     <component name="calendar_custamization_api" long-name="Calendar Customization API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_plat/calendar_custamization_api/group"/>
+     </component>
+    </collection>
+    <collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
+     <component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_pub/calendar_interim_utils2_api/group"/>
+     </component>
+     <component name="notepad_library_api" long-name="Notepad Library API" filter="s60" class="api">
+      <unit bldFile="app/organizer/organizer_pub/notepad_library_api/group"/>
+     </component>
+    </collection>
     <collection name="alarmengines" long-name="Alarm Engines" level="engine">
      <component name="missedalarmstore" filter="s60" long-name="Missed Alarm Store">
       <unit bldFile="app/organizer/alarmengines/missedalarmstore/group"/>
@@ -6160,18 +9229,97 @@
      </component>
     </collection>
     <collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
-     <component name="organizer_pub" filter="s60" long-name="Organizer Application Suite Public Interfaces" class="api">
-      <unit bldFile="app/organizer/organizer_pub/group"/>
-     </component>
-     <component name="organizer_plat" filter="s60" long-name="Organizer Application Suite Platform Interfaces" class="api">
-      <unit bldFile="app/organizer/organizer_plat/group"/>
-     </component>
      <component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
+    <collection name="msg_pub" long-name="Messaging Apps Public APIs" level="ui">
+     <component name="messaging_integration_api" long-name="Messaging Integration API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_pub/messaging_integration_api/group"/>
+     </component>
+     <component name="plugin_bio_control_api" long-name="Plug-in Bio Control API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_pub/plugin_bio_control_api/group"/>
+     </component>
+     <component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_pub/mms_client_mtm_api/group"/>
+     </component>
+     <component name="open_new_message_notification_api" long-name="Open New Message Notification API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_pub/open_new_message_notification_api/group"/>
+     </component>
+     <component name="messaging_editor_constants_api" long-name="Messaging Editor Constants API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_pub/messaging_editor_constants_api/group"/>
+     </component>
+    </collection>
+    <collection name="msg_plat" long-name="Messaging Apps Platform APIs" level="ui">
+     <component name="smil_player_launch_api" long-name="SMIL Player Launch API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/smil_player_launch_api/group"/>
+     </component>
+     <component name="messaging_media_resolver_api" long-name="Messaging Media Resolver API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/messaging_media_resolver_api/group"/>
+     </component>
+     <component name="smil_engine_api" long-name="SMIL Engine API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/smil_engine_api/group"/>
+     </component>
+     <component name="mms_server_settings_api" long-name="MMS Server Settings API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/mms_server_settings_api/group"/>
+     </component>
+     <component name="new_contacts_note_secondary_display_api" long-name="New Contacts Note Secondary Display API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/new_contacts_note_secondary_display_api/group"/>
+     </component>
+     <component name="messaging_center_ui_utilities_api" long-name="Messaging Center UI Utilities API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/messaging_center_ui_utilities_api/group"/>
+     </component>
+     <component name="internet_mail_mtm_ui_api" long-name="Internet Mail MTM UI API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/internet_mail_mtm_ui_api/group"/>
+     </component>
+     <component name="messaging_editor_api" long-name="Messaging Editor API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/messaging_editor_api/group"/>
+     </component>
+     <component name="email_domain_utilities_api" long-name="Email Domain Utilities API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/email_domain_utilities_api/group"/>
+     </component>
+     <component name="smil_transition_api" long-name="SMIL Transition API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/smil_transition_api/group"/>
+     </component>
+     <component name="new_contacts_note_status_api" long-name="New Contacts Note Status API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/new_contacts_note_status_api/group"/>
+     </component>
+     <component name="unified_editor_video_conversion_api" long-name="Unified Editor Video Conversion API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/unified_editor_video_conversion_api/group"/>
+     </component>
+     <component name="mms_conformance_api" long-name="MMS Conformance API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/mms_conformance_api/group"/>
+     </component>
+     <component name="new_contacts_note_variables_api" long-name="New Contacts Note Variables API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/new_contacts_note_variables_api/group"/>
+     </component>
+     <component name="new_message_notification_api" long-name="New Message Notification API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/new_message_notification_api/group"/>
+     </component>
+     <component name="mms_application_api" long-name="MMS Application API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/mms_application_api/group"/>
+     </component>
+     <component name="mms_engine_settings_api" long-name="MMS Engine Settings API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/mms_engine_settings_api/group"/>
+     </component>
+     <component name="mms_codec_client_api" long-name="MMS Codec Client API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/mms_codec_client_api/group"/>
+     </component>
+     <component name="send_ui_meeting_request_api" long-name="Send UI Meeting Request API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/send_ui_meeting_request_api/group"/>
+     </component>
+     <component name="new_contact_notes_extended_api" long-name="New Contact Notes Extended API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/new_contact_notes_extended_api/group"/>
+     </component>
+     <component name="mail_ui_constants_api" long-name="Mail UI Constants API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/mail_ui_constants_api/group"/>
+     </component>
+     <component name="sim_dialog_launch_api" long-name="SIM Dialog Launch API" filter="s60" class="api">
+      <unit bldFile="app/messaging/msg_plat/sim_dialog_launch_api/group"/>
+     </component>
+    </collection>
     <collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
      <component name="audiomsg" filter="s60" long-name="Audio Message">
       <unit bldFile="app/messaging/mobilemessaging/audiomsg/group"/>
@@ -6315,18 +9463,28 @@
      </component>
     </collection>
     <collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-     <component name="msg_plat" long-name="Messaging Apps Platform APIs" filter="s60" class="api">
-      <unit bldFile="app/messaging/msg_plat/group"/>
-     </component>
-     <component name="msg_pub" long-name="Messaging Apps Public APIs" filter="s60" class="api">
-      <unit bldFile="app/messaging/msg_pub/group"/>
-     </component>
      <component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="^2" purpose="development" class="config PC">
       <unit mrp="app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
      </component>
     </collection>
    </block>
    <block name="commonemail" level="apps" span="2" long-name="Email Apps" levels="service support ui app">
+    <collection name="email_pub" long-name="Email Apps Public Interfaces" level="app">
+     <component name="email_widget_api" long-name="Email Widget API" filter="s60" class="api">
+      <unit bldFile="app/commonemail/email_pub/email_widget_api/group"/>
+     </component>
+    </collection>
+    <collection name="email_plat" long-name="Email Apps Platform Interfaces" level="app">
+     <component name="email_client_api" long-name="Email Client API" filter="s60" class="api">
+      <unit bldFile="app/commonemail/email_plat/email_client_api/group"/>
+     </component>
+     <component name="email_setup_plugin_api" long-name="Email Setup Plugin API" filter="s60" class="api">
+      <unit bldFile="app/commonemail/email_plat/email_setup_plugin_api/group"/>
+     </component>
+     <component name="email_crkeys_api" long-name="Email CenRep Keys API" filter="s60" class="api">
+      <unit bldFile="app/commonemail/email_plat/email_crkeys_api/group"/>
+     </component>
+    </collection>
     <collection name="emailservices" long-name="Email Services" level="service">
      <component name="emailframework" filter="s60" long-name="Email Framework" introduced="^2">
       <unit bldFile="app/commonemail/emailservices/emailframework/group"/>
@@ -6462,15 +9620,20 @@
       <!-- should this be commented out or not? -->
       <!-- <unit bldFile="help/group"/> -->
      </component>
-     <component name="email_plat" filter="s60" long-name="Email Apps Platform Interfaces" class="api">
-      <unit bldFile="app/commonemail/email_plat/group"/>
-     </component>
-     <component name="email_pub" filter="s60" long-name="Email Apps Public Interfaces" class="api">
-      <unit bldFile="app/commonemail/email_pub/group"/>
-     </component>
     </collection>
    </block>
    <block name="conversations" level="apps" long-name="Conversation Apps" levels="settings utils plugin ui">
+    <collection name="conversations_plat" long-name="Conversation Apps Platform Interfaces" level="ui">
+     <component name="im_cv_launcher_api" long-name="IM CV Launcher API" filter="s60" class="api">
+      <unit bldFile="app/conversations/conversations_plat/im_cv_launcher_api/group"/>
+     </component>
+     <component name="im_connection_api" long-name="IM Connection API" filter="s60" class="api">
+      <unit bldFile="app/conversations/conversations_plat/im_connection_api/group"/>
+     </component>
+     <component name="im_cv_appui_api" long-name="IM CV App UI API" filter="s60" class="api">
+      <unit bldFile="app/conversations/conversations_plat/im_cv_appui_api/group"/>
+     </component>
+    </collection>
     <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
      <!-- this is really at the wrong rank. should move down a directory -->
      <component name="vimpstsettings" filter="s60" long-name="VIMP Service Tab Settings">
@@ -6552,9 +9715,6 @@
      </component>
     </collection>
     <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-     <component name="conversations_plat" filter="s60" long-name="Conversation Apps Platform Interfaces" class="api">
-      <unit bldFile="app/conversations/conversations_plat/group"/>
-     </component>
      <component name="conversations_build" filter="s60" long-name="Conversation Apps Build">
       <!-- can the exports be moved to other components? or this remade into a configuration component?-->
       <unit bldFile="app/conversations/group"/>
@@ -6562,32 +9722,40 @@
     </collection>
    </block>
    <block name="im" level="apps" long-name="Instant Messaging Apps" levels="support prot engine apps">
+    <collection name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" level="apps">
+     <component name="wv_sap_settings_api" long-name="WV SAP Settings API" filter="s60" class="api">
+      <unit bldFile="app/im/im_plat/wv_sap_settings_api/group"/>
+     </component>
+    </collection>
     <collection name="wvsettings20" long-name="Wireless Village Settings Engine" level="support">
      <!-- this is really a component. should move down a directory -->
      <component name="wvsapsettingsstore" long-name="WV SAP Settings Store" filter="s60" introduced="9.3">
       <unit bldFile="app/im/wvsettings20/group"/>
      </component>
     </collection>
-    <collection name="im_info" long-name="Instant Messaging Apps Info" level="apps">
-     <component name="im_plat" filter="s60" long-name="Instant Messaging Apps Platform Interfaces" class="api">
-      <unit bldFile="app/im/im_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="dictionary" level="services" long-name="Dictionary" levels="utils ui">
+    <collection name="dictionary_plat" long-name="Dictionary Platform Interfaces" level="ui">
+     <component name="menu_suites_macros_api" long-name="Menu Suites Macros API" filter="s60" class="api">
+      <unit bldFile="app/dictionary/dictionary_plat/menu_suites_macros_api/group"/>
+     </component>
+    </collection>
     <collection name="userdict" long-name="User Dictionary" level="ui">
      <!-- collection is really a component, move down a dir -->
      <component name="userdict_build" filter="s60" long-name="Japanese User Dictionary">
       <unit bldFile="app/dictionary/userdict/group"/>
      </component>
     </collection>
-    <collection name="dictionary_info" long-name="Dictionary Info" level="ui">
-     <component name="dictionary_plat" filter="s60" long-name="Dictionary Platform Interfaces" class="api">
-      <unit bldFile="app/dictionary/dictionary_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="camera" level="apps" long-name="Camera Apps">
+    <collection name="camera_plat" long-name="Camera Apps Platform Interfaces">
+     <component name="camcorder_ui_constants_api" long-name="Camcorder UI Constants API" filter="s60" class="api">
+      <unit bldFile="app/camera/camera_plat/camcorder_ui_constants_api/group"/>
+     </component>
+     <component name="active_palette_2_api" long-name="Active Palette 2 API" filter="s60" class="api">
+      <unit bldFile="app/camera/camera_plat/active_palette_2_api/group"/>
+     </component>
+    </collection>
     <collection name="camerauis" long-name="Camera UIs">
      <component name="activepalette" filter="s60" long-name="Active Palette">
       <unit bldFile="app/camera/camerauis/activepalette/group"/>
@@ -6597,13 +9765,26 @@
       <unit bldFile="app/camera/camerauis/cameraapp/help/group"/>
      </component>
     </collection>
-    <collection name="camera_info" long-name="Camera Apps Info">
-     <component name="camera_plat" filter="s60" long-name="Camera Apps Platform Interfaces" class="api">
-      <unit bldFile="app/camera/camera_plat/group"/>
-     </component>
-    </collection>
+    <collection name="camera_info" long-name="Camera Apps Info"/>
    </block>
    <block name="imgeditor" level="apps" long-name="Image Editor Apps" levels="engine ui">
+    <collection name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" level="ui">
+     <component name="image_editor_debug_utilities_api" long-name="Image Editor Debug Utilities API" filter="s60" class="api">
+      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_debug_utilities_api/group"/>
+     </component>
+     <component name="image_editor_utilities_api" long-name="Image Editor Utilities API" filter="s60" class="api">
+      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_utilities_api/group"/>
+     </component>
+     <component name="image_editor_definitions_api" long-name="Image Editor Definitions API" filter="s60" class="api">
+      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_definitions_api/group"/>
+     </component>
+     <component name="image_editor_system_parameters_api" long-name="Image Editor System Parameters API" filter="s60" class="api">
+      <unit bldFile="app/imgeditor/imgeditor_plat/image_editor_system_parameters_api/group"/>
+     </component>
+     <component name="image_processing_engine_api" long-name="Image Processing Engine API" filter="s60" class="api">
+      <unit bldFile="app/imgeditor/imgeditor_plat/image_processing_engine_api/group"/>
+     </component>
+    </collection>
     <collection name="imageeditor" long-name="Image Editor UI" level="ui">
      <component name="pb" filter="s60" long-name="Plugin Base">
       <unit bldFile="app/imgeditor/imageeditor/pb/group"/>
@@ -6692,13 +9873,13 @@
       <unit bldFile="app/imgeditor/imageeditorengine/group"/>
      </component>
     </collection>
-    <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
-     <component name="imgeditor_plat" filter="s60" long-name="Image Editor Apps Platform Interfaces" class="api">
-      <unit bldFile="app/imgeditor/imgeditor_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
+    <collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
+     <component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
+      <unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
+     </component>
+    </collection>
     <collection name="videditor" long-name="Video Editor" level="ui">
      <component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
       <unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
@@ -6751,13 +9932,19 @@
       <unit bldFile="app/videoeditor/videoeditorengine/group"/>
      </component>
     </collection>
-    <collection name="videoeditor_info" long-name="Video Editor Apps Info" level="ui">
-     <component name="videoeditor_plat" filter="s60" long-name="Video Editor Apps Platform Interfaces" introduced="^2" class="api">
-      <unit bldFile="app/videoeditor/videoeditor_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
+    <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
+     <component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
+      <unit bldFile="app/videoplayer/videoplayer_plat/videoplayer_startup_api/group" filter="!test"/>
+     </component>
+     <component name="video_player_file_details_dialog_api" long-name="Media Player File Details Dialog API" filter="s60" class="api">
+      <unit bldFile="app/videoplayer/videoplayer_plat/video_player_file_details_dialog_api/group" filter="!test"/>
+     </component>
+     <component name="videocollection_api" long-name="Video Collection API" filter="s60" class="api">
+      <unit bldFile="app/videoplayer/videoplayer_plat/videocollection_api/group"/>
+     </component>
+    </collection>
     <collection name="videofeeds" long-name="Video Feeds" level="util">
      <component name="iptv_utils" filter="s60" long-name="IPTV Util" introduced="^3">
       <unit bldFile="app/videoplayer/videofeeds/utils/group"/>
@@ -6866,7 +10053,7 @@
       <unit bldFile="app/videoplayer/videoplayerapp/lwplayer/group"/>
      </component>
      <component name="mpxvideoplayer" filter="s60" long-name="MPX Video Player" plugin="Y">
-      <unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group"/>
+      <unit bldFile="app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
      </component>
      <component name="videoplayerlauncher" filter="s60" long-name="Video Player Launcher">
       <unit bldFile="app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
@@ -6874,28 +10061,40 @@
     </collection>
     <collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
      <component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
-      <unit bldFile="app/videoplayer/videoplayback/videohelix/group"/>
+      <unit bldFile="app/videoplayer/videoplayback/videohelix/group" filter="!test"/>
      </component>
      <component name="videopdlplaybackviewplugin" filter="s60" long-name="Video PDL Playback View Plugin" introduced="^3" plugin="Y">
-      <unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group"/>
+      <unit bldFile="app/videoplayer/videoplayback/videopdlplaybackviewplugin/group" filter="!test"/>
      </component>
      <component name="videoplaybackcontrols" filter="s60" long-name="Video Playback Controls" introduced="^3" plugin="Y">
-      <unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group"/>
+      <unit bldFile="app/videoplayer/videoplayback/videoplaybackcontrols/group" filter="!test"/>
      </component>
      <component name="videoplaybackviewplugin" filter="s60" long-name="Video Playback View Plugin" introduced="^3" plugin="Y">
       <unit bldFile="app/videoplayer/videoplayback/videoplaybackviewplugin/group"/>
      </component>
      <component name="videoplaybackviews" filter="s60" long-name="Video Playback Views" introduced="^3" plugin="Y">
-      <unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group"/>
-     </component>
-    </collection>
-    <collection name="videoplayer_info" long-name="Video Player Apps Info" level="apps">
-     <component name="videoplayer_plat" filter="s60" long-name="Video Player Apps Platform Interfaces" class="api">
-      <unit bldFile="app/videoplayer/videoplayer_plat/group"/>
+      <unit bldFile="app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
      </component>
     </collection>
    </block>
    <block name="photos" level="apps" long-name="Photos" levels="support fw ui app">
+    <collection name="photos_plat" long-name="Photos Platform Interfaces" level="app">
+     <component name="collection_plugins_api" long-name="Collection Plugins API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/photos/photos_plat/collection_plugins_api/group"/>
+     </component>
+     <component name="controllers_collection_api" long-name="Controllers Collection API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/photos/photos_plat/controllers_collection_api/group"/>
+     </component>
+     <component name="gallery_utilities_api" long-name="Gallery Utilities API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/photos/photos_plat/gallery_utilities_api/group"/>
+     </component>
+     <component name="slideshow_ui_constants_api" long-name="Slideshow Ui Constants API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/photos/photos_plat/slideshow_ui_constants_api/group"/>
+     </component>
+     <component name="views_metadatadialog_api" long-name="Views Metadata Dialog API" introduced="^2" filter="s60" class="api">
+      <unit bldFile="app/photos/photos_plat/views_metadatadialog_api/group"/>
+     </component>
+    </collection>
     <collection name="photosgallery" long-name="Photos Gallery" level="app">
      <!-- consider splitting this collection into the application itself, and the frameworks behind it -->
      <component name="photosgallery_help" filter="s60" long-name="Photos Help" introduced="^2">
@@ -6949,13 +10148,37 @@
       <unit bldFile="app/photos/photosgallery/group"/>
      </component>
     </collection>
-    <collection name="photos_info" long-name="Photos Info" level="app">
-     <component name="photos_plat" filter="s60" long-name="Photos Platform Interfaces" introduced="^2" class="api">
-      <unit bldFile="app/photos/photos_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="musicplayer" level="apps" long-name="Music Player Apps" levels="plugins support hs app">
+    <collection name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" level="app">
+     <component name="mpx_music_player_app_api" long-name="MPX Music Player App API" filter="s60" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_app_api/group"/>
+     </component>
+     <component name="mpx_music_player_commonui_api" long-name="MPX Music Player Common UI API" filter="s60" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/group"/>
+     </component>
+     <component name="mpx_music_player_media_key_handler_api" long-name="MPX Music Player Media Key Handler API" filter="s60" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/group"/>
+     </component>
+     <component name="mpx_music_player_remote_control_api" long-name="MPX Music Player Remote Control API" filter="s60" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_player_remote_control_api/group"/>
+     </component>
+     <component name="mpx_music_shop_ui_api" long-name="MPX Music Shop UI API" filter="s60" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_shop_ui_api/group"/>
+     </component>
+     <component name="mpx_music_wap_adapter_cenrep_api" long-name="MPX Music Wap Adapter CenRep API" filter="s60" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_wap_adapter_cenrep_api/group"/>
+     </component>
+     <component name="mpx_music_store_api" long-name="MPX Music Store Find API" filter="s60" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/mpx_music_store_api/group"/>
+     </component>
+     <component name="audio_application_features_api" long-name="Audio Application Features API" filter="s60" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/audio_application_features_api/group"/>
+     </component>
+     <component name="music_content_publisher_plugin_api" long-name="Music Content Publisher Plugin API" filter="s60" class="api">
+      <unit bldFile="app/musicplayer/musicplayer_plat/music_content_publisher_plugin_api/group"/>
+     </component>
+    </collection>
     <collection name="mpxmusicplayer" long-name="MPX Music Player" level="app">
      <component name="mpxmusicplayer_help" filter="s60" long-name="Help">
       <unit bldFile="app/musicplayer/mpxmusicplayer/help/group"/>
@@ -7016,9 +10239,6 @@
       <!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
       <unit bldFile="app/musicplayer/group"/>
      </component>
-     <component name="musicplayer_plat" filter="s60" long-name="Music Player Apps Platform Interfaces" class="api">
-      <unit bldFile="app/musicplayer/musicplayer_plat/group"/>
-     </component>
     </collection>
    </block>
    <block name="radio" level="apps" long-name="Radio Apps" levels="engine ui">
@@ -7051,17 +10271,21 @@
    <block name="tv" level="services" long-name="TV Apps"/>
    <block name="voicerec" level="apps" long-name="Voice Recorder Apps">
     <!-- custom filter pref_test-->
+    <collection name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces">
+     <component name="new_file_service_api" long-name="New File Service API" filter="s60" class="api">
+      <unit bldFile="app/voicerec/voicerec_plat/new_file_service_api/group"/>
+     </component>
+     <component name="voicerecorder_public_constants_api" long-name="Voice Recorder Public Constants API" filter="s60" class="api">
+      <unit bldFile="app/voicerec/voicerec_plat/voicerecorder_public_constants_api/group"/>
+     </component>
+    </collection>
     <collection name="voicerecorder" long-name="Voice Recorder">
      <!--this is really a component, move down a directory -->
      <component name="voicerecorder_build" filter="s60" long-name="Voice Recorder Build">
       <unit bldFile="app/voicerec/voicerecorder/group"/>
      </component>
     </collection>
-    <collection name="voicerec_info" long-name="Voice Recorder Apps Info">
-     <component name="voicerec_plat" filter="s60" long-name="Voice Recorder Apps Platform Interfaces" class="api">
-      <unit bldFile="app/voicerec/voicerec_plat/group"/>
-     </component>
-    </collection>
+    <collection name="voicerec_info" long-name="Voice Recorder Apps Info"/>
    </block>
    <block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
     <!-- is this a user-facing application or a daemon? -->
@@ -7087,6 +10311,17 @@
     </collection>
    </block>
    <block name="homescreen" level="apps" long-name="Home Screen Apps" levels="fw support apps">
+    <collection name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" level="apps">
+     <component name="menu_settings_api" long-name="Menu Settings API" filter="s60" class="api">
+      <unit bldFile="app/homescreen/homescreen_plat/menu_settings_api/group"/>
+     </component>
+     <component name="hs_content_control_ui" long-name="HS Content Control Ui" filter="s60" class="api">
+      <unit bldFile="app/homescreen/homescreen_plat/hs_content_control_ui/group"/>
+     </component>
+     <component name="hs_renderingplugin_api" long-name="HS Rendering Plugin API" filter="s60" class="api">
+      <unit bldFile="app/homescreen/homescreen_plat/hs_renderingplugin_api/group"/>
+     </component>
+    </collection>
     <collection name="idlehomescreen" long-name="Idle Home Screen" level="apps">
      <component name="nativeuicontroller" filter="s60" long-name="Native UI Controller">
       <unit bldFile="app/homescreen/idlehomescreen/nativeuicontroller/group"/>
@@ -7146,16 +10381,17 @@
       <unit bldFile="app/homescreen/taskswitcher/taskswitcherui/group"/>
      </component>
     </collection>
-    <collection name="homescreen_info" long-name="Home Screen Apps Info" level="apps">
-     <component name="homescreen_plat" filter="s60" long-name="Home Screen Apps Platform Interfaces" class="api">
-      <unit bldFile="app/homescreen/homescreen_plat/group"/>
-     </component>
-    </collection>
    </block>
    <block name="graphicsuis" level="services" long-name="Graphics UIs" levels="util ui">
-    <collection name="graphicsuis_info" long-name="Graphics UIs Info" level="ui">
-     <component name="graphicsuis_plat" filter="s60" long-name="Graphics UIs Platform Interfaces" class="api">
-      <unit bldFile="app/graphicsuis/graphicsuis_plat/group"/>
+    <collection name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" level="ui">
+     <component name="svgt_viewer_ui_api" long-name="SVG-T Viewer UI API" filter="s60" class="api">
+      <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_viewer_ui_api/group"/>
+     </component>
+     <component name="svg_application_observer_utility_api" long-name="SVG Application Observer Utility API" filter="s60" class="api">
+      <unit bldFile="app/graphicsuis/graphicsuis_plat/svg_application_observer_utility_api/group"/>
+     </component>
+     <component name="svgt_file_view_details_dialog_api" long-name="SVG-T File View Details Dialog API" filter="s60" class="api">
+      <unit bldFile="app/graphicsuis/graphicsuis_plat/svgt_file_view_details_dialog_api/group"/>
      </component>
     </collection>
     <collection name="svgtviewer" long-name="SVG-T Viewer" level="ui">
@@ -7165,21 +10401,106 @@
     </collection>
    </block>
    <block name="profile" level="apps" long-name="Profiles" levels="app">
+    <collection name="profile_plat" long-name="Profiles Platform Interfaces" level="app">
+     <component name="profiles_settings_view_api" long-name="Profiles Settings View API" filter="s60" class="api">
+      <unit bldFile="app/profile/profile_plat/profiles_settings_view_api/group"/>
+     </component>
+    </collection>
     <collection name="profilesapplication" long-name="Profiles Application" level="app">
      <component name="profiles" filter="s60" long-name="Profiles">
       <unit bldFile="app/profile/profilesapplication/profiles/group"/>
      </component>
     </collection>
     <collection name="profile_info" long-name="Profiles Info" level="app">
-     <component name="profile_plat" filter="s60" long-name="Profiles Platform Interfaces" class="api">
-      <unit bldFile="app/profile/profile_plat/group"/>
-     </component>
      <component name="profile_help" filter="s60" long-name="Profiles Help">
       <unit bldFile="app/profile/help/group"/>
      </component>
     </collection>
    </block>
    <block name="speechsrv" level="services" long-name="Speech Recognition UIs" levels="engine framework ui">
+    <collection name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" level="ui">
+     <component name="vas_api" long-name="VAS API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/vas_api/group"/>
+     </component>
+     <component name="nss_devasr_api" long-name="NSS DevASR API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/nss_devasr_api/group"/>
+     </component>
+     <component name="tts_hw_device_api" long-name="TTS HW Device API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/tts_hw_device_api/group"/>
+     </component>
+     <component name="voice_commands_resource_header_api" long-name="Voice Commands Resource Header API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/voice_commands_resource_header_api/group"/>
+     </component>
+     <component name="nss_mmf_tts_custom_commands_api" long-name="NSS MMF TTS Custom Commands API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/nss_mmf_tts_custom_commands_api/group"/>
+     </component>
+     <component name="srsf_cenrep_settings_api" long-name="SRSF CenRep Settings API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/srsf_cenrep_settings_api/group"/>
+     </component>
+     <component name="voice_ui_plugin_api" long-name="Voice UI Plug-in API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_plugin_api/group"/>
+     </component>
+     <component name="nss_tts_utility_api" long-name="NSS TTS Utility API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_utility_api/group"/>
+     </component>
+     <component name="nss_srs_custom_commands_api" long-name="NSS SRS Custom Commands API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_custom_commands_api/group"/>
+     </component>
+     <component name="srsf_secondarydisplay_api" long-name="SRSF Secondary Display API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/srsf_secondarydisplay_api/group"/>
+     </component>
+     <component name="asrs_hw_device_api" long-name="ASRS Hardware Device API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/asrs_hw_device_api/group"/>
+     </component>
+     <component name="vas_vcommand_api" long-name="VAS Voice Command API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/vas_vcommand_api/group"/>
+     </component>
+     <component name="adaptation_hw_device_api" long-name="Adaptation Hardware Device API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/adaptation_hw_device_api/group"/>
+     </component>
+     <component name="nss_devtts_api" long-name="NSS DevTTS API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/nss_devtts_api/group"/>
+     </component>
+     <component name="nss_srs_utility_api" long-name="NSS SRS Utility API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/nss_srs_utility_api/group"/>
+     </component>
+     <component name="recognition_hw_device_api" long-name="Recognition Hardware Device API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/recognition_hw_device_api/group"/>
+     </component>
+     <component name="vas_contact_handler_api" long-name="VAS Contact Handler API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/vas_contact_handler_api/group"/>
+     </component>
+     <component name="nlp_hw_device" long-name="NLP Hardware Device" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/nlp_hw_device/group"/>
+     </component>
+     <component name="nss_si_speech_recognition_data_api" long-name="NSS SI Speech Recognition Data API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/nss_si_speech_recognition_data_api/group"/>
+     </component>
+     <component name="nss_tts_common_api" long-name="NSS TTS Common API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/nss_tts_common_api/group"/>
+     </component>
+     <component name="grcompiler_hw_device_api" long-name="Grammar Compiler Hardware Device API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/grcompiler_hw_device_api/group"/>
+     </component>
+     <component name="ttp_hw_device_api" long-name="TTP Hardware Device API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/ttp_hw_device_api/group"/>
+     </component>
+     <component name="vocman_hw_device_api" long-name="VocMan Hardware Device API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/vocman_hw_device_api/group"/>
+     </component>
+     <component name="speech_synthesis_clientserver_api" long-name="Speech Synthesis Client-Server API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/speech_synthesis_clientserver_api/group"/>
+     </component>
+     <component name="voice_ui_accessory_button_handling_api" long-name="Voice UI Accessory Button Handling API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/voice_ui_accessory_button_handling_api/group"/>
+     </component>
+     <component name="ui_voice_recognition_api" long-name="UI Voice Recognition API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/ui_voice_recognition_api/group"/>
+     </component>
+     <component name="vcommand_settings_cenrep_api" long-name="Voice Command Settings CenRep API" filter="s60" class="api">
+      <unit bldFile="app/speechsrv/speechsrv_plat/vcommand_settings_cenrep_api/group"/>
+     </component>
+    </collection>
     <collection name="voiceui" long-name="Voice UI" level="ui">
      <component name="vcommand" filter="s60" long-name="Voice Commands UI" introduced="^1">
       <unit bldFile="app/speechsrv/voiceui/vcommand/group"/>
@@ -7270,11 +10591,7 @@
       <unit bldFile="app/speechsrv/srsf/group"/>
      </component>
     </collection>
-    <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui">
-     <component name="speechsrv_plat" filter="s60" long-name="Speech Recognition UIs Platform Interfaces" class="api">
-      <unit bldFile="app/speechsrv/speechsrv_plat/group"/>
-     </component>
-    </collection>
+    <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui"/>
    </block>
    <block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
     <collection name="dtdinstaller" long-name="DTD Installer" level="install">
@@ -7343,6 +10660,17 @@
     </collection>
    </block>
    <block name="jrt" level="services" long-name="Java Runtime" levels="util generic rt ui">
+    <collection name="jrt_plat" long-name="JRT Platform Interfaces" level="ui">
+     <component name="java_registry_api" long-name="Java Registry API" filter="s60" class="api">
+      <unit bldFile="app/jrt/jrt_plat/java_registry_api/build"/>
+     </component>
+     <component name="java_env_info_api" long-name="Java Environment Info API" filter="s60" class="api">
+      <unit bldFile="app/jrt/jrt_plat/java_env_info_api/build"/>
+     </component>
+     <component name="java_debug_api" long-name="Java Debug API" filter="s60" class="api">
+      <unit bldFile="app/jrt/jrt_plat/java_debug_api/build"/>
+     </component>
+    </collection>
     <collection name="java_stubs" long-name="Java Stubs" level="util">
      <!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
      <component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
@@ -7360,12 +10688,9 @@
      </component>
     </collection>
     <collection name="jrt_info" long-name="JRT Info" level="rt">
-     <component name="jrt_plat" filter="s60" long-name="JRT Platform Interfaces" class="api">
-      <unit bldFile="app/jrt/jrt_plat/group"/>
-     </component>
      <component name="jrt_build" filter="s60" long-name="JRT Build">
       <!--  needed for __JAVA_STUBS condition -->
-      <unit bldFile="app/jrt/java_stubs/group"/>
+      <unit bldFile="app/jrt/group"/>
      </component>
     </collection>
    </block>
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Thu Mar 18 11:43:11 2010 +0000
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Fri Mar 19 14:46:47 2010 +0000
@@ -64,7 +64,7 @@
    <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">
@@ -254,6 +254,367 @@
     </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"/>
@@ -272,19 +633,24 @@
     </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">
@@ -355,6 +721,9 @@
      <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">
@@ -370,13 +739,7 @@
     <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"/>
-     </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"/>
+      <unit bldFile="/os/ossrv/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"/>
@@ -435,6 +798,257 @@
     </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"/>
@@ -618,14 +1232,6 @@
      
     </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>
@@ -652,7 +1258,12 @@
      <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">
+      <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">
@@ -700,6 +1311,10 @@
      <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>
@@ -1021,6 +1636,74 @@
     </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"/>
@@ -1046,12 +1729,6 @@
      
     </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>
@@ -1068,11 +1745,6 @@
       <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"/>
@@ -1176,6 +1848,20 @@
     </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"/>
@@ -1246,15 +1932,17 @@
      </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>
@@ -1268,15 +1956,332 @@
      </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"/>
@@ -1367,12 +2372,6 @@
      </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>
@@ -1483,6 +2482,40 @@
     </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"/>
+      
+     </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"/>
+      
+     </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"/>
@@ -1500,16 +2533,6 @@
       <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>
-     
-     
-    </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">
@@ -1561,11 +2584,13 @@
       <unit bldFile="/os/graphics/graphicstest/uibench/group" mrp="/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
      </component>
     </collection>
-    <collection id="graphics_info" name="Graphics Info" level="app-if">
+    <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"/>
-      <!-- cope with missing graphics_plat/group -->
-     </component>
+     </component>
+    </collection>
+    <collection id="graphics_info" name="Graphics Info" level="app-if">
      <component id="graphicsdocs" name="Graphics Documentation" purpose="development" class="doc">
       <unit mrp="/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
      </component>
@@ -1662,6 +2687,26 @@
     </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"/>
@@ -1738,18 +2783,32 @@
      </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"/>
@@ -1788,9 +2847,6 @@
      </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>
@@ -1962,6 +3018,7 @@
     </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">
@@ -1983,6 +3040,7 @@
     </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">
@@ -2021,10 +3079,6 @@
      </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>
@@ -2033,6 +3087,138 @@
   </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 -->
@@ -2174,7 +3360,9 @@
      <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" 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">
@@ -2217,18 +3405,81 @@
      </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">
@@ -2346,9 +3597,6 @@
      </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_metadata" name="Security Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
       <unit mrp="/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
@@ -2356,6 +3604,84 @@
     </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">
@@ -2402,16 +3728,125 @@
      </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>
      
     </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"/>
@@ -2496,16 +3931,66 @@
       <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 -->
@@ -2529,13 +4014,91 @@
       <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"/>
@@ -2620,12 +4183,6 @@
      </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"/>
@@ -2633,6 +4190,20 @@
     </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"/>
@@ -2700,15 +4271,22 @@
      </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"/>
@@ -2749,15 +4327,30 @@
      </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-->
@@ -2800,14 +4393,15 @@
       <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"/>
@@ -2927,12 +4521,35 @@
       <!-- 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">
@@ -2966,9 +4583,6 @@
      </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"/>
@@ -2979,6 +4593,163 @@
     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
@@ -3082,16 +4853,38 @@
      </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>
      
     </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">
@@ -3147,18 +4940,117 @@
      </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">
@@ -3191,13 +5083,61 @@
       <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">
@@ -3245,13 +5185,13 @@
       <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">
@@ -3282,13 +5222,165 @@
       <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"/>
@@ -3393,16 +5485,14 @@
       <!--<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"/>
@@ -3442,11 +5532,6 @@
       <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">
@@ -3455,9 +5540,6 @@
      </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>
@@ -3507,15 +5589,38 @@
     </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>
@@ -3528,6 +5633,40 @@
    </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"/>
@@ -3719,9 +5858,6 @@
      </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"/>
@@ -3730,6 +5866,70 @@
     </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"/>
@@ -3771,12 +5971,6 @@
      </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>
@@ -3784,10 +5978,49 @@
     </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>
      
     </collection>
     <collection id="usbengines" name="USB Engines" level="generic">
@@ -3847,13 +6080,41 @@
      <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"/>
@@ -3889,13 +6150,23 @@
       <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"/>
+      
+     </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">
@@ -3908,29 +6179,98 @@
       <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>
-     
-    </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"/>
+      
+     </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"/>
+      
+      <!-- can only have one unit with the same filter, #include the following from the previous unit -->
+      
+      
+      
+      
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
@@ -4017,24 +6357,80 @@
      </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_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"/>
@@ -4096,6 +6492,20 @@
     </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"/>
@@ -4113,13 +6523,107 @@
      </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>
      
     </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"/>
+      
+     </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"/>
@@ -4176,10 +6680,6 @@
     </collection>
     <collection id="mmmw_info" name="Multimedia Middleware Info" level="specific">
      
-     
-     <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>
@@ -4194,6 +6694,44 @@
     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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">
@@ -4223,10 +6761,6 @@
      </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_build" filter="s60" name="Camera Services Build">
       <!-- should split into individual bld.infs -->
       <unit bldFile="/mw/camerasrv/group"/>
@@ -4234,6 +6768,99 @@
     </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"/>
@@ -4305,12 +6932,73 @@
      <component id="mmappfw_test" filter="s60,test,api_test,pref_test" name="Multimedia App Framework Test" purpose="development" introduced="^1">
       
      </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">
+    </collection>
+   </package>
+   <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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </component>
+    </collection>
     <collection id="textinput" name="Text Input" level="framework">
      <component id="ptienginev2" filter="s60" name="Predictive Text Input Engine">
       <meta rel="config">
@@ -4395,14 +7083,7 @@
       <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">
-     <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>
-     
+    <collection id="inputmethods_info" name="Input Methods Info" level="api">
      
      <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"/>
@@ -4411,6 +7092,729 @@
    </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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">
@@ -4523,24 +7927,22 @@
      </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_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">
-     <component id="svgt_plat" filter="s60" name="SVG Tiny Platform Interfaces" class="api" introduced="9.2">
-      <unit bldFile="/mw/svgt/svgt_plat/group"/>
+    <collection id="svgt_plat" name="SVG Tiny Platform Interfaces" level="ui">
+     <component id="svgt_api" name="SVGT API" introduced="9.2" class="api" filter="s60">
+      <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">
@@ -4554,9 +7956,30 @@
     </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">
-     <component id="uiaccelerator_plat" filter="s60" name="UI Accelerator Platform Interfaces" class="api">
-      <unit bldFile="/mw/uiaccelerator/uiaccelerator_plat/group"/>
+    <collection id="uiaccelerator_plat" name="UI Accelerator Platform Interfaces" level="if">
+     <component id="alf_core_toolkit_api" name="ALF Core Toolkit API" class="api" filter="s60">
+      <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">
@@ -4570,34 +7993,114 @@
     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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">
       
      </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 -->
-      
-      
-      
-      
-      
-      
-     </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 -->
-      
-      
-      
-      
-      
-     </component>
     </collection>
     <collection id="uigraphics" name="UI Graphics" level="generic">
      <component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
@@ -4670,6 +8173,26 @@
     </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">
@@ -4698,16 +8221,56 @@
       <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"/>
@@ -4727,16 +8290,100 @@
       <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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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">
@@ -4812,6 +8459,7 @@
     </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>
@@ -4860,14 +8508,52 @@
       <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>
-     
-    </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">
@@ -4933,12 +8619,6 @@
      </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_metadata" name="Application Installation Metadata" class="config" introduced="^2" purpose="development" target="desktop">
       <unit mrp="/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
@@ -4946,6 +8626,45 @@
     </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"/>
@@ -4966,14 +8685,6 @@
       <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 -->
@@ -5021,13 +8732,109 @@
     </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"/>
@@ -5215,6 +9022,36 @@
     </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">
@@ -5311,9 +9148,6 @@
       <!-- 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">
@@ -5327,6 +9161,22 @@
     </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">
@@ -5370,18 +9220,26 @@
       <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"/>
@@ -5483,16 +9341,22 @@
       <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"/>
@@ -5502,7 +9366,8 @@
      </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"/>
+      
      </component>
      <component id="mmshmanagersrv" filter="s60" name="Multimedia Sharing Manager Server">
       <unit bldFile="/app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
@@ -5511,7 +9376,7 @@
       <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>
@@ -5541,19 +9406,78 @@
       <!--  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>
-     
     </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"/>
+      
      </component>
      <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
       <unit bldFile="/app/phone/phoneapp/phoneuicontrol/group"/>
@@ -5576,7 +9500,6 @@
      <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
       <unit bldFile="/app/phone/phoneapp/phonemediatorcenter/group"/>
      </component>
-     
     </collection>
     <collection id="phoneengine" name="Phone Engine" level="engine">
      <component id="phonecntfinder" filter="s60" name="Phone Contact Finder">
@@ -5614,7 +9537,8 @@
     </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"/>
+      
      </component>
      <component id="easydialing" filter="s60" name="Easy Dialing Plugin" class="plugin" introduced="^3">
       <unit bldFile="/app/phone/phoneuis/easydialing/group"/>
@@ -5634,12 +9558,6 @@
      <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
       <unit bldFile="/app/phone/phoneuis/telephonydevicemode/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">
@@ -5648,6 +9566,16 @@
     </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"/>
@@ -5675,13 +9603,28 @@
       <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"/>
@@ -5788,13 +9731,19 @@
       <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"/>
+      
+     </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"/>
@@ -5818,17 +9767,30 @@
       <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>
-     
-    </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">
@@ -5843,11 +9805,6 @@
       <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">
@@ -5967,6 +9924,12 @@
     </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">
@@ -6002,11 +9965,6 @@
       <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">
@@ -6022,6 +9980,243 @@
     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
+      
+     </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"/>
@@ -6108,19 +10303,104 @@
      </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_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"/>
@@ -6317,18 +10597,124 @@
      </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"/>
@@ -6472,18 +10858,31 @@
      </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"/>
@@ -6622,15 +11021,22 @@
       <!-- 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">
@@ -6712,9 +11118,6 @@
      </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"/>
@@ -6722,32 +11125,44 @@
     </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"/>
@@ -6758,13 +11173,32 @@
      </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>
      
     </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"/>
@@ -6853,13 +11287,14 @@
       <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"/>
@@ -6912,13 +11347,22 @@
       <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"/>
+      
+     </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"/>
+      
+     </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"/>
@@ -7031,7 +11475,8 @@
       <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"/>
+      
      </component>
      <component id="videoplayerlauncher" filter="s60" name="Video Player Launcher">
       <unit bldFile="/app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
@@ -7039,30 +11484,43 @@
     </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"/>
+      
      </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"/>
+      
      </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"/>
-     </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>
-     
+      <unit bldFile="/app/videoplayer/videoplayback/videoplaybackviews/group" filter="!test"/>
+      
+     </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">
@@ -7116,13 +11574,46 @@
       <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"/>
@@ -7186,9 +11677,6 @@
       <!-- 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>
      
     </collection>
    </package>
@@ -7222,6 +11710,16 @@
    <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">
@@ -7230,9 +11728,6 @@
     </collection>
     <collection id="voicerec_info" name="Voice Recorder Apps Info">
      
-     <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">
@@ -7272,6 +11767,18 @@
     </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"/>
@@ -7336,16 +11843,20 @@
       <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">
-     <component id="graphicsuis_plat" filter="s60" name="Graphics UIs Platform Interfaces" class="api">
-      <unit bldFile="/app/graphicsuis/graphicsuis_plat/group"/>
+    <collection id="graphicsuis_plat" name="Graphics UIs Platform Interfaces" level="ui">
+     <component id="svgt_viewer_ui_api" name="SVG-T Viewer UI API" class="api" filter="s60">
+      <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">
@@ -7355,6 +11866,12 @@
     </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"/>
@@ -7362,15 +11879,122 @@
      
     </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"/>
@@ -7466,9 +12090,6 @@
     </collection>
     <collection id="speechsrv_info" name="Speech Recognition UIs Info" level="ui">
      
-     <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">
@@ -7544,6 +12165,17 @@
     </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"/>
@@ -7564,12 +12196,9 @@
      </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>